2008-07-16 16:46:03

by Adrian Bunk

Subject: [2.6 patch] 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 <[email protected]>

---

arch/sh/mm/pg-sh4.c | 2 +-
arch/sh/mm/pg-sh7705.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

c11efb5cb7b6455f6478b3f300c96b7a6778450c
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index 8c7a9ca..38870e0 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(copy_user_highpage);
/*
* For SH-4, we have our own implementation for ptep_get_and_clear
*/
-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;

diff --git a/arch/sh/mm/pg-sh7705.c b/arch/sh/mm/pg-sh7705.c
index 7f885b7..eaf2514 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;

2008-07-17 05:55:04

by Paul Mundt

Subject: Re: [2.6 patch] fix sh ptep_get_and_clear breakage

On Wed, Jul 16, 2008 at 07:45:40PM +0300, Adrian Bunk wrote:
> 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 <[email protected]>
>
Magnus already fixed this for pg-sh4, but the SH7705 implementation was
overlooked, so I applied your patch there. Thanks.