um: take system.h out of shared/sysdep
authorAl Viro <viro@ftp.linux.org.uk>
Thu, 18 Aug 2011 19:04:49 +0000 (20:04 +0100)
committerRichard Weinberger <richard@nod.at>
Wed, 2 Nov 2011 13:14:57 +0000 (14:14 +0100)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/include/asm/system-um.h [moved from arch/um/include/asm/system.h with 96% similarity]
arch/um/sys-x86/asm/system.h [moved from arch/um/sys-x86/shared/sysdep/system.h with 99% similarity]

similarity index 96%
rename from arch/um/include/asm/system.h
rename to arch/um/include/asm/system-um.h
index 68a90ec..0eec245 100644 (file)
@@ -1,8 +1,6 @@
 #ifndef __UM_SYSTEM_GENERIC_H
 #define __UM_SYSTEM_GENERIC_H
 
-#include "sysdep/system.h"
-
 extern int get_signals(void);
 extern int set_signals(int enable);
 extern void block_signals(void);
similarity index 99%
rename from arch/um/sys-x86/shared/sysdep/system.h
rename to arch/um/sys-x86/asm/system.h
index d1b93c4..a89113b 100644 (file)
@@ -6,6 +6,7 @@
 #include <asm/cpufeature.h>
 #include <asm/cmpxchg.h>
 #include <asm/nops.h>
+#include <asm/system-um.h>
 
 #include <linux/kernel.h>
 #include <linux/irqflags.h>