summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/pg-sh4.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-22 13:08:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-22 13:08:57 +0200
commit0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch)
tree81dcf756db373444140bb2623584710c628e3048 /arch/sh/mm/pg-sh4.c
parentfbdbf709938d155c719c76b9894d28342632c797 (diff)
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
downloadop-kernel-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip
op-kernel-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.gz
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'arch/sh/mm/pg-sh4.c')
-rw-r--r--arch/sh/mm/pg-sh4.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud