Merge Paulus' tree

[karo-tx-linux.git] / fs / ntfs / malloc.h

diff --git a/fs/ntfs/malloc.h b/fs/ntfs/malloc.h
index 006946efca8cf158daf7108a368a9b180cfa792d..e38e402e410351c6a70ff9ae148f10133ee28177 100644 (file)
--- 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);