aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/types.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-13 18:49:06 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-13 18:49:06 -0400
commit7217cbccbd0c620a6d234ebbe5e58d46d2188d0e (patch)
treeed8ad2161ca664c9100cb3fc1f9b0d8c3762500c /include/linux/types.h
parentSUNRPC: fix bug in patch "portmapper doesn't need a reserved port" (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/types.h')
-rw-r--r--include/linux/types.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/types.h b/include/linux/types.h
index 2b678c22ca4a..0aee34f9da9f 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -165,6 +165,10 @@ typedef __u64 __bitwise __le64;
typedef __u64 __bitwise __be64;
#endif
+#ifdef __KERNEL__
+typedef unsigned __nocast gfp_t;
+#endif
+
struct ustat {
__kernel_daddr_t f_tfree;
__kernel_ino_t f_tinode;