[PATCH] x86: Fix non-kernel use of include/linux/types.h

[PATCH] x86: Fix non-kernel use of include/linux/types.h

[Rusty Russell]

In file included from ../../include/linux/if_tun.h:21,
                 from lguest.c:30:
../../include/linux/types.h:203: error: expected specifier-qualifier-list before ‘__kernel_daddr_t’

This reversion was created by e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9
'x86: cleanup duplicate includes' which removed the !__KERNEL__ case from
asm-x86/posix_types.h.

CC: Joe Perches <joe@perches.com>
---
 include/asm-x86/posix_types.h |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff -r c06e2499a606 include/asm-x86/posix_types.h
--- a/include/asm-x86/posix_types.h	Tue Apr 22 07:59:24 2008 +1000
+++ b/include/asm-x86/posix_types.h	Tue Apr 22 08:59:18 2008 +1000
@@ -1,7 +1,5 @@
-#ifdef __KERNEL__
-# if defined(CONFIG_X86_32) || defined(__i386__)
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
+#if defined(CONFIG_X86_32) || defined(__i386__)
+# include "posix_types_32.h"
+#else
+# include "posix_types_64.h"
 #endif

Re: [PATCH] x86: Fix non-kernel use of include/linux/types.h

[Adrian Bunk]

On Fri, Apr 25, 2008 at 01:14:38AM +1000, Rusty Russell wrote:
> In file included from ../../include/linux/if_tun.h:21,
>                  from lguest.c:30:
> ../../include/linux/types.h:203: error: expected specifier-qualifier-list before ‘__kernel_daddr_t’
> 
> This reversion was created by e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9
> 'x86: cleanup duplicate includes' which removed the !__KERNEL__ case from
> asm-x86/posix_types.h.

I'd actually prefer my patch [1] that:
- reverts to the 2.6.24 status quo since we shouldn't leak CONFIG_* to
  userspace at all and
- also fixes the same regression in unistd.h

> CC: Joe Perches <joe@perches.com>
> ---
>  include/asm-x86/posix_types.h |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff -r c06e2499a606 include/asm-x86/posix_types.h
> --- a/include/asm-x86/posix_types.h	Tue Apr 22 07:59:24 2008 +1000
> +++ b/include/asm-x86/posix_types.h	Tue Apr 22 08:59:18 2008 +1000
> @@ -1,7 +1,5 @@
> -#ifdef __KERNEL__
> -# if defined(CONFIG_X86_32) || defined(__i386__)
> -#  include "posix_types_32.h"
> -# else
> -#  include "posix_types_64.h"
> -# endif
> +#if defined(CONFIG_X86_32) || defined(__i386__)
> +# include "posix_types_32.h"
> +#else
> +# include "posix_types_64.h"
>  #endif

cu
Adrian

[1] http://lkml.org/lkml/2008/4/20/181

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH] x86: Fix non-kernel use of include/linux/types.h

[Rusty Russell]

On Friday 25 April 2008 02:01:01 Adrian Bunk wrote:
> On Fri, Apr 25, 2008 at 01:14:38AM +1000, Rusty Russell wrote:
> > In file included from ../../include/linux/if_tun.h:21,
> >                  from lguest.c:30:
> > ../../include/linux/types.h:203: error: expected specifier-qualifier-list
> > before ‘__kernel_daddr_t’
> >
> > This reversion was created by e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9
> > 'x86: cleanup duplicate includes' which removed the !__KERNEL__ case from
> > asm-x86/posix_types.h.
>
> I'd actually prefer my patch [1] that:
> - reverts to the 2.6.24 status quo since we shouldn't leak CONFIG_* to
>   userspace at all and
> - also fixes the same regression in unistd.h

Yep, prefer your patch too.

Cheers,
Rusty.