diff options
author | Nathan Scott <nathans@sgi.com> | 2005-11-03 00:14:31 -0500 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2005-11-03 00:14:31 -0500 |
commit | 7f248a81c5067f5b018ff889c029b960b399ac08 (patch) | |
tree | 20242df58ea1f871ba89ade5ce15e2faddefa0f4 /fs/xfs/linux-2.6/kmem.h | |
parent | 538524aed09fd2c52094afadf0160cef8954d4c8 (diff) |
[XFS] Cleanup cosmetic differences between source trees.
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/kmem.h')
-rw-r--r-- | fs/xfs/linux-2.6/kmem.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h index de4a60d9676d..8f82c1a20dc5 100644 --- a/fs/xfs/linux-2.6/kmem.h +++ b/fs/xfs/linux-2.6/kmem.h | |||
@@ -69,7 +69,7 @@ typedef unsigned long xfs_pflags_t; | |||
69 | 69 | ||
70 | static __inline gfp_t kmem_flags_convert(unsigned int __nocast flags) | 70 | static __inline gfp_t kmem_flags_convert(unsigned int __nocast flags) |
71 | { | 71 | { |
72 | gfp_t lflags = __GFP_NOWARN; /* we'll report problems, if need be */ | 72 | gfp_t lflags = __GFP_NOWARN; /* we'll report problems, if need be */ |
73 | 73 | ||
74 | #ifdef DEBUG | 74 | #ifdef DEBUG |
75 | if (unlikely(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL))) { | 75 | if (unlikely(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL))) { |
@@ -88,7 +88,7 @@ static __inline gfp_t kmem_flags_convert(unsigned int __nocast flags) | |||
88 | if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS)) | 88 | if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS)) |
89 | lflags &= ~__GFP_FS; | 89 | lflags &= ~__GFP_FS; |
90 | } | 90 | } |
91 | 91 | ||
92 | return lflags; | 92 | return lflags; |
93 | } | 93 | } |
94 | 94 | ||
@@ -111,13 +111,13 @@ kmem_zone_destroy(kmem_zone_t *zone) | |||
111 | BUG(); | 111 | BUG(); |
112 | } | 112 | } |
113 | 113 | ||
114 | extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); | 114 | extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); |
115 | extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast); | 115 | extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast); |
116 | 116 | ||
117 | extern void *kmem_alloc(size_t, unsigned int __nocast); | 117 | extern void *kmem_alloc(size_t, unsigned int __nocast); |
118 | extern void *kmem_realloc(void *, size_t, size_t, unsigned int __nocast); | 118 | extern void *kmem_realloc(void *, size_t, size_t, unsigned int __nocast); |
119 | extern void *kmem_zalloc(size_t, unsigned int __nocast); | 119 | extern void *kmem_zalloc(size_t, unsigned int __nocast); |
120 | extern void kmem_free(void *, size_t); | 120 | extern void kmem_free(void *, size_t); |
121 | 121 | ||
122 | typedef struct shrinker *kmem_shaker_t; | 122 | typedef struct shrinker *kmem_shaker_t; |
123 | typedef int (*kmem_shake_func_t)(int, gfp_t); | 123 | typedef int (*kmem_shake_func_t)(int, gfp_t); |