---

yaml --- r: 305250 b: refs/heads/master c: e45af0e h: refs/heads/master v: v3
git-mirror · May 14, 2012 · b90ac65 · b90ac65
1 parent 8d6ed78
commit b90ac65
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e7c297efeca0861adcca073a0d283da659834b
+refs/heads/master: e45af0e083dfc5d49dbad6965b9eeb3ac0072d82
diff --git a/trunk/arch/sh/include/asm/fixmap.h b/trunk/arch/sh/include/asm/fixmap.h
@@ -96,7 +96,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);
 #ifdef CONFIG_SUPERH32
 #define FIXADDR_TOP	(P3_ADDR_MAX - PAGE_SIZE)
 #else
-#define FIXADDR_TOP	(0xff000000 - PAGE_SIZE)
+#define FIXADDR_TOP	((unsigned long)(-PAGE_SIZE))
 #endif
 #define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)
 #define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)

diff --git a/trunk/arch/sh/include/asm/pgtable_64.h b/trunk/arch/sh/include/asm/pgtable_64.h
@@ -87,9 +87,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
 #define pte_unmap(pte)		do { } while (0)
 
 #ifndef __ASSEMBLY__
-#define IOBASE_VADDR	0xff000000
-#define IOBASE_END	0xffffffff
-
 /*
  * PTEL coherent flags.
  * See Chapter 17 ST50 CPU Core Volume 1, Architecture.

diff --git a/trunk/arch/sh/mm/fault_64.c b/trunk/arch/sh/mm/fault_64.c
@@ -246,8 +246,7 @@ asmlinkage int do_fast_page_fault(unsigned long long ssr_md,
 	tsk = current;
 	mm = tsk->mm;
 
-	if ((address >= VMALLOC_START && address < VMALLOC_END) ||
-	    (address >= IOBASE_VADDR  && address < IOBASE_END)) {
+	if ((address >= VMALLOC_START && address < VMALLOC_END)) {
 		if (ssr_md)
 			/*
 			 * Process-contexts can never have this address