Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 27 Sep 2006 18:57:54 +0000 (19:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Sep 2006 18:57:54 +0000 (19:57 +0100)
1  2 
include/asm-arm/page.h

diff --combined include/asm-arm/page.h
index af9c3fe7588c4c1b3b0808ae59637fecac6a397c,02bd3ee935b07e0c88c2f865aa6c4510d814c4dc..7e85db77d99b12f635514a7c84e9b8c713064af4
  #define _ASMARM_PAGE_H
  
  
+ #ifdef __KERNEL__
  /* PAGE_SHIFT determines the page size */
  #define PAGE_SHIFT            12
  #define PAGE_SIZE             (1UL << PAGE_SHIFT)
  #define PAGE_MASK             (~(PAGE_SIZE-1))
  
- #ifdef __KERNEL__
  /* to align the pointer to the (next) page boundary */
  #define PAGE_ALIGN(addr)      (((addr)+PAGE_SIZE-1)&PAGE_MASK)
  
@@@ -174,6 -174,9 +174,6 @@@ typedef unsigned long pgprot_t
  
  #endif /* STRICT_MM_TYPECHECKS */
  
 -/* the upper-most page table pointer */
 -extern pmd_t *top_pmd;
 -
  #endif /* CONFIG_MMU */
  
  #include <asm/memory.h>