summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/malloc.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-09-12 15:43:03 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-09-12 15:43:03 +0100
commit89ecf38c7aee6eb3f6aaf40a6d196ddff4b6d4a8 (patch)
tree5ef720a9cb7fa8320e4a813ce53bcb82c2d42aff /fs/ntfs/malloc.h
parent5d46770f5f8bb0eff0a82596860958be13e7baf1 (diff)
downloadlinux-89ecf38c7aee6eb3f6aaf40a6d196ddff4b6d4a8.tar.bz2
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.h2
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,
if (likely(size <= PAGE_SIZE)) {
BUG_ON(!size);
/* kmalloc() has per-CPU caches so is faster for now. */
- return kmalloc(PAGE_SIZE, gfp_mask);
+ return kmalloc(PAGE_SIZE, gfp_mask & ~__GFP_HIGHMEM);
/* return (void *)__get_free_page(gfp_mask); */
}
if (likely(size >> PAGE_SHIFT < num_physpages))