From dd768c56da44f6c06486da3b33b41e9c13e985c5 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 18 Aug 2011 20:04:49 +0100
Subject: [PATCH] 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>
---
 arch/um/include/asm/{system.h => system-um.h}   | 2 --
 arch/um/sys-x86/{shared/sysdep => asm}/system.h | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename arch/um/include/asm/{system.h => system-um.h} (96%)
 rename arch/um/sys-x86/{shared/sysdep => asm}/system.h (99%)

diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system-um.h
similarity index 96%
rename from arch/um/include/asm/system.h
rename to arch/um/include/asm/system-um.h
index 68a90ecd1450..0eec24579288 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
similarity index 99%
rename from arch/um/sys-x86/shared/sysdep/system.h
rename to arch/um/sys-x86/asm/system.h
index d1b93c436200..a89113bc74f2 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>
-- 
2.20.1