diff --git a/[refs] b/[refs] index cca1f09de5f1..7a724db5f024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1744a21d57d9c60136461adb6afa85e51b3e94d9 +refs/heads/master: 3446a8aa7ebcbc0a799e5e8fc4f2da0738d6bc21 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index ede84fa7da5d..6d12174fbe11 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1919,8 +1919,9 @@ extern void __init vfs_caches_init(unsigned long); extern struct kmem_cache *names_cachep; -#define __getname() kmem_cache_alloc(names_cachep, GFP_KERNEL) -#define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) +#define __getname_gfp(gfp) kmem_cache_alloc(names_cachep, (gfp)) +#define __getname() __getname_gfp(GFP_KERNEL) +#define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) #ifndef CONFIG_AUDITSYSCALL #define putname(name) __putname(name) #else