diff -Naur linux-2.6.11.orig/include/asm-sh/thread_info.h linux-2.6.11/include/asm-sh/thread_info.h --- linux-2.6.11.orig/include/asm-sh/thread_info.h 2005-03-02 16:38:13.000000000 +0900 +++ linux-2.6.11/include/asm-sh/thread_info.h 2005-07-24 10:18:10.000000000 +0900 @@ -10,8 +10,6 @@ * - Incorporating suggestions made by Linus Torvalds and Dave Miller */ -#ifdef __KERNEL__ - #ifndef __ASSEMBLY__ #include @@ -97,6 +95,4 @@ #define _TIF_WORK_MASK 0x000000FE /* work to do on interrupt/exception return */ #define _TIF_ALLWORK_MASK 0x000000FF /* work to do on any return to u-space */ -#endif /* __KERNEL__ */ - #endif /* __ASM_SH_THREAD_INFO_H */ diff -Naur linux-2.6.11.orig/include/asm-sh/types.h linux-2.6.11/include/asm-sh/types.h --- linux-2.6.11.orig/include/asm-sh/types.h 2005-03-02 16:38:26.000000000 +0900 +++ linux-2.6.11/include/asm-sh/types.h 2005-07-24 10:17:25.000000000 +0900 @@ -19,10 +19,14 @@ typedef __signed__ int __s32; typedef unsigned int __u32; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif +#ifndef __GNUC__ +# ifndef __extension__ +# define __extension__ +# endif /* __extension__ */ +#endif /* __GNUC__ */ + +__extension__ typedef __signed__ long long __s64; +__extension__ typedef unsigned long long __u64; #endif /* __ASSEMBLY__ */