summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:04:49 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:14:57 +0100
commitdd768c56da44f6c06486da3b33b41e9c13e985c5 (patch)
treed81069a34b943ee2bd6257fce4124ddfbd846f13
parent00361683ce562402a189362f43370a459b166645 (diff)
um: take system.h out of shared/sysdep
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/um/include/asm/system-um.h (renamed from arch/um/include/asm/system.h)2
-rw-r--r--arch/um/sys-x86/asm/system.h (renamed from arch/um/sys-x86/shared/sysdep/system.h)1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system-um.h
index 68a90ecd145..0eec2457928 100644
--- a/arch/um/include/asm/system.h
+++ b/arch/um/include/asm/system-um.h
@@ -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);
diff --git a/arch/um/sys-x86/shared/sysdep/system.h b/arch/um/sys-x86/asm/system.h
index d1b93c43620..a89113bc74f 100644
--- a/arch/um/sys-x86/shared/sysdep/system.h
+++ b/arch/um/sys-x86/asm/system.h
@@ -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>