From f523d4e5454810345b8211b769815ab89e15eda1 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 26 Feb 2009 00:51:45 +0100 Subject: [PATCH] --- yaml --- r: 135852 b: refs/heads/master c: 3a471cbc081b6bf2b58a48db13d734ecd3b0d437 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/statfs.h | 5 +++-- trunk/include/linux/types.h | 13 ++----------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e731584b00a8..5e3daca55b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60c195c729532815c5209c81442fa0eb26ace706 +refs/heads/master: 3a471cbc081b6bf2b58a48db13d734ecd3b0d437 diff --git a/trunk/include/asm-generic/statfs.h b/trunk/include/asm-generic/statfs.h index 6129d6802149..3b4fb3e52f0d 100644 --- a/trunk/include/asm-generic/statfs.h +++ b/trunk/include/asm-generic/statfs.h @@ -1,8 +1,9 @@ #ifndef _GENERIC_STATFS_H #define _GENERIC_STATFS_H -#ifndef __KERNEL_STRICT_NAMES -# include +#include + +#ifdef __KERNEL__ typedef __kernel_fsid_t fsid_t; #endif diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h index fca82ed55f49..5abe354020f9 100644 --- a/trunk/include/linux/types.h +++ b/trunk/include/linux/types.h @@ -13,7 +13,7 @@ #include -#ifndef __KERNEL_STRICT_NAMES +#ifdef __KERNEL__ typedef __u32 __kernel_dev_t; @@ -31,7 +31,6 @@ typedef __kernel_timer_t timer_t; typedef __kernel_clockid_t clockid_t; typedef __kernel_mqd_t mqd_t; -#ifdef __KERNEL__ typedef _Bool bool; typedef __kernel_uid32_t uid_t; @@ -47,14 +46,6 @@ typedef __kernel_old_uid_t old_uid_t; typedef __kernel_old_gid_t old_gid_t; #endif /* CONFIG_UID16 */ -/* libc5 includes this file to define uid_t, thus uid_t can never change - * when it is included by non-kernel code - */ -#else -typedef __kernel_uid_t uid_t; -typedef __kernel_gid_t gid_t; -#endif /* __KERNEL__ */ - #if defined(__GNUC__) typedef __kernel_loff_t loff_t; #endif @@ -156,7 +147,7 @@ typedef unsigned long blkcnt_t; #define pgoff_t unsigned long #endif -#endif /* __KERNEL_STRICT_NAMES */ +#endif /* __KERNEL__ */ /* * Below are truly Linux-specific types that should never collide with