[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090924100232.19291.70594.stgit@warthog.procyon.org.uk>
Date: Thu, 24 Sep 2009 11:02:32 +0100
From: David Howells <dhowells@...hat.com>
To: torvalds@...l.org, akpm@...ux-foundation.org
Cc: ebmunson@...ibm.com, rientjes@...gle.com, dhowells@...hat.com,
linux-kernel@...r.kernel.org
Subject: [PATCH] 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 <ebmunson@...ibm.com>
Date: Mon Sep 21 17:03:47 2009 -0700
hugetlb: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions
Signed-off-by: David Howells <dhowells@...hat.com>
---
include/linux/hugetlb.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 176e7ee..c5d3111 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists