X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fntfs%2Fmalloc.h;h=cd0be3f5c3cd34a5d5209adafcf6ad518ff7da0b;hb=14b8869ff4f00f105ea76678997b4d49d27baae3;hp=006946efca8cf158daf7108a368a9b180cfa792d;hpb=e5baa396af7560382d2cf3f0871d616b61fc284c;p=linux-2.6

diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index 006946efca..cd0be3f5c3 100644
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@@ -39,8 +39,7 @@
  * If there was insufficient memory to complete the request, return NULL.
  * Depending on @gfp_mask the allocation may be guaranteed to succeed.
  */
-static inline void *__ntfs_malloc(unsigned long size,
-		unsigned int __nocast gfp_mask)
+static inline void *__ntfs_malloc(unsigned long size, gfp_t gfp_mask)
 {
 	if (likely(size <= PAGE_SIZE)) {
 		BUG_ON(!size);
@@ -86,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;