diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-12 08:25:52 -0700 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-12 08:25:52 -0700 |
| commit | c3242291382c4ee2a30f4ef62270cd1c8a5b923f (patch) | |
| tree | c71197e23b00d5ca858839e0c530ddfcf0b9d656 /fs/ntfs/malloc.h | |
| parent | 1df5c10a5b40d1ad747e3de3caf28764153c5c8e (diff) | |
| parent | 89ecf38c7aee6eb3f6aaf40a6d196ddff4b6d4a8 (diff) | |
Merge branch 'master' of imp.csi.cam.ac.uk:/home/src/ntfs-2.6.git/
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 9994e019a3c..3288bcc2c4a 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)) |