summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-16 19:45:40 +0300
committerPaul Mundt <lethal@linux-sh.org>2008-07-28 18:10:35 +0900
commitc46acb8e2093779bda393f028099477f98cfef3c (patch)
treeae8f4c3d41f10232e12e3ec2a2d52bcd4069597d
parentcbe9da029d9cc4fff59d559789885079a84a0af8 (diff)
downloadlinux-3.10-c46acb8e2093779bda393f028099477f98cfef3c.tar.gz
linux-3.10-c46acb8e2093779bda393f028099477f98cfef3c.tar.bz2
linux-3.10-c46acb8e2093779bda393f028099477f98cfef3c.zip
fix sh ptep_get_and_clear breakage
Commit 1ea0704e0da65b2b46f9142ff1391163aac24060 (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>
-rw-r--r--arch/sh/mm/pg-sh7705.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/pg-sh7705.c b/arch/sh/mm/pg-sh7705.c
index 7f885b7f8af..eaf25147194 100644
--- a/arch/sh/mm/pg-sh7705.c
+++ b/arch/sh/mm/pg-sh7705.c
@@ -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;