fix sh ptep_get_and_clear breakage

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Monday, July 28, 2008 - 10:08 am

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c46acb...
Commit:     c46acb8e2093779bda393f028099477f98cfef3c
Parent:     cbe9da029d9cc4fff59d559789885079a84a0af8
Author:     Adrian Bunk <bunk@kernel.org>
AuthorDate: Wed Jul 16 19:45:40 2008 +0300
Committer:  Paul Mundt <lethal@linux-sh.org>
CommitDate: Mon Jul 28 18:10:35 2008 +0900

    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>
---
 arch/sh/mm/pg-sh7705.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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;
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
fix sh ptep_get_and_clear breakage, Linux Kernel Mailing ..., (Mon Jul 28, 10:08 am)