Commit c46acb8e authored Jul 16, 2008 by Adrian Bunk Committed by Paul Mundt Jul 28, 2008

fix sh ptep_get_and_clear breakage



Commit 1ea0704e
(mm: add a ptep_modify_prot transaction abstraction)
triggered on sh build errors like the following:

<--  snip  -->

...
  CC      arch/sh/mm/pg-sh4.o
cc1: warnings being treated as errors
include2/asm/pgtable.h:139: error: 'ptep_get_and_clear' declared inline after being called
include2/asm/pgtable.h:139: error: previous declaration of 'ptep_get_and_clear' was here
make[2]: *** [arch/sh/mm/pg-sh4.o] Error 1

<--  snip  -->

Since there's no good reason for marking these global functions as
"inline" this patch therefore removes the inline's.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent cbe9da02

arch/sh/mm/pg-sh7705.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ void copy_user_page(void to, void from, unsigned long address, struct page *pg
		* For SH7705, we have our own implementation for ptep_get_and_clear
		* Copied from pg-sh4.c
		*/
		inline pte_t ptep_get_and_clear(struct mm_struct mm, unsigned long addr, pte_t ptep)
		pte_t ptep_get_and_clear(struct mm_struct mm, unsigned long addr, pte_t ptep)
		{
		pte_t pte = *ptep;

Admin message