HugeTLB: Fix unused variable warning
PATCH 1/1 HugeTLB: Fix unused variable warning
Fix an unused variable warning:
mm/mmap.c: In function 'do_mmap_pgoff':
mm/mmap.c:953: warning: unused variable 'user'
by converting the CONFIG_HUGETLBFS=n version of hugetlb_file_setup() into an inline function instead of a macro.
Introduced by:
commit 4e52780d41a741fb4861ae1df2413dd816ec11b1 Author: Eric B Munson <[email protected]> Date: Mon Sep 21 17:03:47 2009 -0700 hugetlb: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions
---
include/linux/hugetlb.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
include/linux/hugetlb.h +9 -2
@@ -3,6 +3,8 @@#include <linux/fs.h> +struct user_struct ; +#ifdef CONFIG_HUGETLB_PAGE #include <linux/mempolicy.h>
@@ -10,7 +12,6 @@#include <asm/tlbflush.h> struct ctl_table ; -struct user_struct ;int PageHuge (struct page *page);
@@ -187,7 +188,13 @@ static inline void set_file_hugepages(struct file *file)#define is_file_hugepages (file) 0#define set_file_hugepages (file) BUG() -#define hugetlb_file_setup (name,size,acct,user,creat) ERR_PTR(-ENOSYS) + +static inline +struct file *hugetlb_file_setup (const char *name,size_t size,int acctflag, +struct user_struct **user,int creat_flags) +{ +return ERR_PTR (-ENOSYS ); +}#endif /* !CONFIG_HUGETLBFS */
Quoted 8 lines · David Howells
Fix an unused variable warning:
mm/mmap.c: In function 'do_mmap_pgoff':
mm/mmap.c:953: warning: unused variable 'user'by converting the
CONFIG_HUGETLBFS=nversion ofhugetlb_file_setup()into an inline function instead of a macro.
Quoted 8 lines
Introduced by:
commit 4e52780d41a741fb4861ae1df2413dd816ec11b1 Author: Eric B Munson <[email protected]> Date: Mon Sep 21 17:03:47 2009 -0700 hugetlb: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regionsSigned-off-by David Howells <[email protected]>
Quoted 8 lines · David Howells
Fix an unused variable warning:
mm/mmap.c: In function 'do_mmap_pgoff':
mm/mmap.c:953: warning: unused variable 'user'by converting the
CONFIG_HUGETLBFS=nversion ofhugetlb_file_setup()into an inline function instead of a macro.
Quoted 8 lines
Introduced by:
commit 4e52780d41a741fb4861ae1df2413dd816ec11b1 Author: Eric B Munson <[email protected]> Date: Mon Sep 21 17:03:47 2009 -0700 hugetlb: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regionsSigned-off-by David Howells <[email protected]>
Andrew added hugetlb_file_setup-use-c-not-cpp.patch to -mm on Tuesday and it should appear in the next mmotm.
From: Andrew Morton <[email protected]>
why macros are always wrong:
mm/mmap.c: In function 'do_mmap_pgoff':mm/mmap.c:953: warning: unused variable 'user'
also, move a couple of struct forward-decls outside #ifdef CONFIG_HUGETLB_PAGE' - it's pointless and frequently harmful to make these conditional (eg, this patch needed struct user_struct').
---
include/linux/hugetlb.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~hugetlb_file_setup-use-c-not-cpp +8 -4
@@ -3,15 +3,15 @@#include <linux/fs.h> +struct ctl_table ; +struct user_struct ; +#ifdef CONFIG_HUGETLB_PAGE #include <linux/mempolicy.h> #include <linux/shm.h> #include <asm/tlbflush.h> -struct ctl_table ; -struct user_struct ; -int PageHuge (struct page *page);static inline int is_vm_hugetlb_page (struct vm_area_struct *vma)
@@ -187,7 +187,11 @@ static inline void set_file_hugepages(st#define is_file_hugepages (file) 0#define set_file_hugepages (file) BUG() -#define hugetlb_file_setup (name,size,acct,user,creat) ERR_PTR(-ENOSYS) +static inline struct file *hugetlb_file_setup (const char *name,size_t size,int acctflag, +struct user_struct **user,int creat_flags) +{ +return ERR_PTR (-ENOSYS ); +}#endif /* !CONFIG_HUGETLBFS */