diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-12 10:43:03 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-12 10:43:03 -0400 |
commit | 89ecf38c7aee6eb3f6aaf40a6d196ddff4b6d4a8 (patch) | |
tree | 5ef720a9cb7fa8320e4a813ce53bcb82c2d42aff /fs/ntfs/malloc.h | |
parent | 5d46770f5f8bb0eff0a82596860958be13e7baf1 (diff) |
NTFS: Mask out __GFP_HIGHMEM when doing kmalloc() in __ntfs_malloc() as it
otherwise causes a BUG().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/malloc.h')
-rw-r--r-- | fs/ntfs/malloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h index 9994e019a3cf..3288bcc2c4aa 100644 --- a/fs/ntfs/malloc.h +++ b/fs/ntfs/malloc.h | |||
@@ -45,7 +45,7 @@ static inline void *__ntfs_malloc(unsigned long size, | |||
45 | if (likely(size <= PAGE_SIZE)) { | 45 | if (likely(size <= PAGE_SIZE)) { |
46 | BUG_ON(!size); | 46 | BUG_ON(!size); |
47 | /* kmalloc() has per-CPU caches so is faster for now. */ | 47 | /* kmalloc() has per-CPU caches so is faster for now. */ |
48 | return kmalloc(PAGE_SIZE, gfp_mask); | 48 | return kmalloc(PAGE_SIZE, gfp_mask & ~__GFP_HIGHMEM); |
49 | /* return (void *)__get_free_page(gfp_mask); */ | 49 | /* return (void *)__get_free_page(gfp_mask); */ |
50 | } | 50 | } |
51 | if (likely(size >> PAGE_SHIFT < num_physpages)) | 51 | if (likely(size >> PAGE_SHIFT < num_physpages)) |