diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 16:04:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 16:04:00 +0000 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /fs/ntfs/malloc.h | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
| download | linux-f315ccb3e679f271583f2a4f463ad9b65665b751.tar.bz2 | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ntfs/malloc.h')
| -rw-r--r-- | fs/ntfs/malloc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h index e38e402e4103..cd0be3f5c3cd 100644 --- a/fs/ntfs/malloc.h +++ b/fs/ntfs/malloc.h @@ -85,8 +85,7 @@ static inline void *ntfs_malloc_nofs_nofail(unsigned long size) static inline void ntfs_free(void *addr) { - if (likely(((unsigned long)addr < VMALLOC_START) || - ((unsigned long)addr >= VMALLOC_END ))) { + if (!is_vmalloc_addr(addr)) { kfree(addr); /* free_page((unsigned long)addr); */ return; |