From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 12 Jul 2008 05:29:02 +0000 (+0200)
Subject: Merge branch 'linus' into x86/core
X-Git-Tag: v2.6.27-rc1~1106^2~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ae94b8075a2ed58d2318ef03827b25bc844f844e;p=~shefty%2Frdma-dev.git

Merge branch 'linus' into x86/core

Conflicts:

	arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

ae94b8075a2ed58d2318ef03827b25bc844f844e
diff --cc arch/x86/mm/ioremap.c
index 45e546c4ba7,d1b867101e5..115f13ee40c
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@ -365,7 -388,7 +388,7 @@@ void *xlate_dev_mem_ptr(unsigned long p
  	if (page_is_ram(start >> PAGE_SHIFT))
  		return __va(phys);
  
- 	addr = (void __force *)ioremap(start, PAGE_SIZE);
 -	addr = (void *)ioremap_default(start, PAGE_SIZE);
++	addr = (void __force *)ioremap_default(start, PAGE_SIZE);
  	if (addr)
  		addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));