Merge branch 'master' of /usr/src/ntfs-2.6/

2005-10-11 09:29:48 +01:00
parent e9438250b6 907a426179
commit 29d8699ebb
309 changed files with 7326 additions and 1769 deletions
--- a/fs/ntfs/malloc.h
+++ b/fs/ntfs/malloc.h
@ -40,7 +40,7 @@
 * Depending on @gfp_mask the allocation may be guaranteed to succeed.
 */
 static inline void *__ntfs_malloc(unsigned long size,
-		unsigned int __nocast gfp_mask)
+		gfp_t gfp_mask)
 {
 	if (likely(size <= PAGE_SIZE)) {
 		BUG_ON(!size);