aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sh
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2008-07-03 19:02:41 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-07-28 18:10:27 +0900
commit82706b8f7bd1365e50478d3d0f6090f22e4571c7 (patch)
treeeeef3a7942ad16f94cd582a87a4267bbbdf69a9b /include/asm-sh
parent45dabf1427a0a876f733b07239ade1bdb0e06010 (diff)
downloadmrst-s0i3-test-82706b8f7bd1365e50478d3d0f6090f22e4571c7.tar.gz
mrst-s0i3-test-82706b8f7bd1365e50478d3d0f6090f22e4571c7.tar.xz
mrst-s0i3-test-82706b8f7bd1365e50478d3d0f6090f22e4571c7.zip
sh: Prevent leaking of CONFIG_SUPERH32 to userspace in asm/unistd.h.
CONFIG_SUPERH32 is currently trickling into userspace unistd.h. Attached patch uses __SH5__ define in userspace. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/unistd.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 4b21f369c28..65be656ead7 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -1,5 +1,13 @@
-#ifdef CONFIG_SUPERH32
-# include "unistd_32.h"
+#ifdef __KERNEL__
+# ifdef CONFIG_SUPERH32
+# include "unistd_32.h"
+# else
+# include "unistd_64.h"
+# endif
#else
-# include "unistd_64.h"
+# ifdef __SH5__
+# include "unistd_64.h"
+# else
+# include "unistd_32.h"
+# endif
#endif