2008-07-02 23:56:24

by Khem Raj

Subject: sh-asm/unistd.h userspace cleanup

Hi,

CONFIG_SUPERH32 is currently trickling into userspace unistd.h. Attached patch uses __SH5__define in userspace.

Thanks

-Khem

Signed-off-by: Khem Raj <[email protected]>

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

2008-07-03 07:13:16

by Paul Mundt

Subject: Re: sh-asm/unistd.h userspace cleanup

On Wed, Jul 02, 2008 at 04:56:12PM -0700, Khem Raj wrote:
> Hi,
>
> CONFIG_SUPERH32 is currently trickling into userspace unistd.h. Attached patch uses __SH5__define in userspace.
>
> Thanks
>
> -Khem
>
> Signed-off-by: Khem Raj <[email protected]>
>
Applied, thanks.