Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux...

diff --combined arch/arm/kernel/armksyms.c
index 53d0037a1e9de59c1416f8b05d152ed8aa29148f,23af3c972c9a7d202c0a71a340e29067d4ac8d74..531e1860e546dbf5e5a13016a16cf30aea061c96
--- 1/arch/arm/kernel/armksyms.c
--- 2/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@@ -8,7 -8,6 +8,7 @@@
   * published by the Free Software Foundation.
   */
  #include <linux/module.h>
 +#include <linux/sched.h>
  #include <linux/string.h>
  #include <linux/cryptohash.h>
  #include <linux/delay.h>
@@@ -116,6 -115,8 +116,8 @@@ EXPORT_SYMBOL(__strnlen_user)
  EXPORT_SYMBOL(__strncpy_from_user);
  
  #ifdef CONFIG_MMU
+ EXPORT_SYMBOL(copy_page);
+ 
  EXPORT_SYMBOL(__copy_from_user);
  EXPORT_SYMBOL(__copy_to_user);
  EXPORT_SYMBOL(__clear_user);
@@@ -182,8 -183,6 +184,6 @@@ EXPORT_SYMBOL(_find_first_bit_be)
  EXPORT_SYMBOL(_find_next_bit_be);
  #endif
  
- EXPORT_SYMBOL(copy_page);
- 
  #ifdef CONFIG_FUNCTION_TRACER
  EXPORT_SYMBOL(mcount);
  #endif

diff --combined arch/arm/mm/fault.c
index ffd8b228a1391fbeed41831092f3832914971ce6,22c9530e91e2fd8568fa78e1e5aec95ed7a72a24..0455557a289957e13bab0ef74a37ff0ebe5052d8
--- 1/arch/arm/mm/fault.c
--- 2/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@@ -11,10 -11,10 +11,11 @@@
  #include <linux/module.h>
  #include <linux/signal.h>
  #include <linux/mm.h>
+ #include <linux/hardirq.h>
  #include <linux/init.h>
  #include <linux/kprobes.h>
  #include <linux/uaccess.h>
 +#include <linux/page-flags.h>
  
  #include <asm/system.h>
  #include <asm/pgtable.h>
@@@ -84,14 -84,13 +85,14 @@@ void show_pte(struct mm_struct *mm, uns
                        break;
                }
  
 -#ifndef CONFIG_HIGHMEM
                /* We must not map this if we have highmem enabled */
 +              if (PageHighMem(pfn_to_page(pmd_val(*pmd) >> PAGE_SHIFT)))
 +                      break;
 +
                pte = pte_offset_map(pmd, addr);
                printk(", *pte=%08lx", pte_val(*pte));
                printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE]));
                pte_unmap(pte);
 -#endif
        } while(0);
  
        printk("\n");