Skip to content

Commit

Permalink
x86: fix {clear,copy}_user_page() declarations in page.h
Browse files Browse the repository at this point in the history
Clean up: eliminate some compiler noise on x86 when building with strict
warnings enabled, introduced by commit 345b904.

In file included from include2/asm/thread_info_64.h:12,
                 from include2/asm/thread_info.h:4,
                 from
/home/cel/src/linux/nfs-2.6/include/linux/thread_info.h:35,
                 from
/home/cel/src/linux/nfs-2.6/include/linux/preempt.h:9,
                 from
/home/cel/src/linux/nfs-2.6/include/linux/spinlock.h:49,
                 from /home/cel/src/linux/nfs-2.6/include/linux/mmzone.h:7,
                 from /home/cel/src/linux/nfs-2.6/include/linux/gfp.h:4,
                 from /home/cel/src/linux/nfs-2.6/include/linux/slab.h:14,
                 from /home/cel/src/linux/nfs-2.6/fs/nfsd/nfs4acl.c:40:
include2/asm/page.h:55: warning: `inline' is not at beginning of
declaration
include2/asm/page.h:61: warning: `inline' is not at beginning of
declaration

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Chuck Lever authored and Ingo Molnar committed Mar 21, 2008
1 parent 3078b79 commit f2f7abc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/asm-x86/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ extern int page_is_ram(unsigned long pagenr);

struct page;

static void inline clear_user_page(void *page, unsigned long vaddr,
static inline void clear_user_page(void *page, unsigned long vaddr,
struct page *pg)
{
clear_page(page);
}

static void inline copy_user_page(void *to, void *from, unsigned long vaddr,
static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
struct page *topage)
{
copy_page(to, from);
Expand Down

0 comments on commit f2f7abc

Please sign in to comment.