From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 17 Dec 2008 20:04:45 +0000 (+0000)
Subject: Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux... 
X-Git-Tag: v2.6.29-rc1~559^2~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c613bbba6f39c8804f1f26e96fb68a117cc9e282;hp=-c;p=linux-2.6-omap-h63xx.git

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

c613bbba6f39c8804f1f26e96fb68a117cc9e282
diff --combined arch/arm/kernel/armksyms.c
index 53d0037a1e9,23af3c972c9..531e1860e54
--- a/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 ffd8b228a13,22c9530e91e..0455557a289
--- a/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");