Merge branch 'highmem' into devel

Conflicts:

	arch/arm/mach-clps7500/include/mach/memory.h

diff --cc arch/arm/include/asm/page.h
index 5fee45e,77747df..f341c9d
--- 1/arch/arm/include/asm/page.h
--- 2/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@@ -122,18 -124,22 +124,22 @@@ extern struct cpu_user_fns cpu_user
  
  #else
  
- #define __cpu_clear_user_page __glue(_USER,_clear_user_page)
- #define __cpu_copy_user_page  __glue(_USER,_copy_user_page)
+ #define __cpu_clear_user_highpage     __glue(_USER,_clear_user_highpage)
+ #define __cpu_copy_user_highpage      __glue(_USER,_copy_user_highpage)
  
- extern void __cpu_clear_user_page(void *p, unsigned long user);
- extern void __cpu_copy_user_page(void *to, const void *from,
-                                unsigned long user);
+ extern void __cpu_clear_user_highpage(struct page *page, unsigned long vaddr);
+ extern void __cpu_copy_user_highpage(struct page *to, struct page *from,
+                       unsigned long vaddr);
  #endif
  
- #define clear_user_page(addr,vaddr,pg)         __cpu_clear_user_page(addr, vaddr)
- #define copy_user_page(to,from,vaddr,pg) __cpu_copy_user_page(to, from, vaddr)
+ #define clear_user_highpage(page,vaddr)               \
+        __cpu_clear_user_highpage(page, vaddr)
+ 
+ #define __HAVE_ARCH_COPY_USER_HIGHPAGE
+ #define copy_user_highpage(to,from,vaddr,vma) \
+       __cpu_copy_user_highpage(to, from, vaddr)
  
 -#define clear_page(page)      memzero((void *)(page), PAGE_SIZE)
 +#define clear_page(page)      memset((void *)(page), 0, PAGE_SIZE)
  extern void copy_page(void *to, const void *from);
  
  #undef STRICT_MM_TYPECHECKS

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc drivers/usb/gadget/pxa25x_udc.c
Simple merge