Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

diff --combined include/asm-arm/page.h
index af9c3fe,02bd3ee..7e85db7
--- 1/include/asm-arm/page.h
--- 2/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@@ -11,13 -11,13 +11,13 @@@
  #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>