Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fe1a68...
Commit:     fe1a6875fcaaac2041945008a9875d2c07be1d9b
Parent:     de3b69d7d87e1e86c0307f0f15b377dcebeab906
Author:     Sebastian Siewior <bigeasy@linutronix.de>
AuthorDate: Tue Jul 15 22:28:46 2008 +0200
Committer:  Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Tue Jul 15 13:58:40 2008 -0700

    mm: fix build on non-mmu machines
    
    Commit 1ea0704e0d aka "mm: add a ptep_modify_prot transaction abstraction"
    
    caused:
    
    |  CC      init/main.o
    |In file included from include2/asm/pgtable.h:68,
    |                 from /home/bigeasy/git/linux-2.6-m68k/include/linux/mm.h:39,
    |                 from include2/asm/uaccess.h:8,
    |                 from /home/bigeasy/git/linux-2.6-m68k/include/linux/poll.h:13,
    |                 from /home/bigeasy/git/linux-2.6-m68k/include/linux/rtc.h:113,
    |                 from /home/bigeasy/git/linux-2.6-m68k/include/linux/efi.h:19,
    |                 from /home/bigeasy/git/linux-2.6-m68k/init/main.c:43:
    |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_start':
    |/linux-2.6/include/asm-generic/pgtable.h:209: error: implicit declaration of function 'ptep_get_and_clear'
    |/linux-2.6/include/asm-generic/pgtable.h:209: error: incompatible types in return
    |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_commit':
    |/linux-2.6/include/asm-generic/pgtable.h:220: error: implicit declaration of function 'set_pte_at'
    |make[2]: *** [init/main.o] Error 1
    |make[1]: *** [init] Error 2
    |make: *** [sub-make] Error 2
    
    on my m68knommu box.
    
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Hugh Dickins <hugh@veritas.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 include/asm-generic/pgtable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 4fce3db..ef87f88 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -195,7 +195,6 @@ static inline int pmd_none_or_clear_bad(pmd_t *pmd)
 	}
 	return 0;
 }
-#endif /* CONFIG_MMU */
 
 static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm,
 					     unsigned long addr,
@@ -253,6 +252,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,
 	__ptep_modify_prot_commit(mm, addr, ptep, pte);
 }
 #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */
+#endif /* CONFIG_MMU */
 
 /*
  * A facility to provide lazy MMU batching.  This allows PTE updates and
--
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