diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 20:30:16 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 20:30:16 +0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /include/linux/types.h | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
| download | linux-15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 0aee34f9da9f..21b9ce803644 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -151,7 +151,12 @@ typedef unsigned long sector_t; */ #ifdef __CHECKER__ -#define __bitwise __attribute__((bitwise)) +#define __bitwise__ __attribute__((bitwise)) +#else +#define __bitwise__ +#endif +#ifdef __CHECK_ENDIAN__ +#define __bitwise __bitwise__ #else #define __bitwise #endif @@ -166,7 +171,7 @@ typedef __u64 __bitwise __be64; #endif #ifdef __KERNEL__ -typedef unsigned __nocast gfp_t; +typedef unsigned __bitwise__ gfp_t; #endif struct ustat { |