From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 3 Jul 2008 10:02:41 +0000 (+0900)
Subject: sh: Prevent leaking of CONFIG_SUPERH32 to userspace in asm/unistd.h.
X-Git-Tag: v2.6.27-rc1~29^2~70
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82706b8f7bd1365e50478d3d0f6090f22e4571c7;p=linux-2.6

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>
---

diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 4b21f369c2..65be656ead 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