---

yaml --- r: 104163 b: refs/heads/master c: b1a8bf9 h: refs/heads/master i: 104161: e47a112 104159: 8bd0795 v: v3
git-mirror · Jul 18, 2008 · 5f8c7ee · 5f8c7ee
1 parent ebff70c
commit 5f8c7ee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b444b9a5a1171ef07e1a87b01f7bb5bd0206d012
+refs/heads/master: b1a8bf92a0303301f3e013e2a2f45a4916453ce7
diff --git a/trunk/arch/sparc/kernel/entry.S b/trunk/arch/sparc/kernel/entry.S
@@ -19,6 +19,7 @@
 #include <asm/vaddrs.h>
 #include <asm/memreg.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #ifdef CONFIG_SUN4
 #include <asm/pgtsun4.h>
 #else

diff --git a/trunk/include/asm-sparc/Kbuild b/trunk/include/asm-sparc/Kbuild
@@ -6,6 +6,7 @@ header-y += bpp.h
 header-y += display7seg.h
 header-y += envctrl.h
 header-y += jsflash.h
+header-y += openprom.h
 header-y += openpromio.h
 header-y += psrcompat.h
 header-y += pstate.h

diff --git a/trunk/include/asm-sparc/openprom.h b/trunk/include/asm-sparc/openprom.h
@@ -7,8 +7,6 @@
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <asm/vaddrs.h>
-
 /* Empirical constants... */
 #define	LINUX_OPPROM_MAGIC      0x10010407
 

diff --git a/trunk/include/asm-sparc/pgtable.h b/trunk/include/asm-sparc/pgtable.h
@@ -8,6 +8,7 @@
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
+#ifndef __ASSEMBLY__
 #include <asm-generic/4level-fixup.h>
 
 #include <linux/spinlock.h>
@@ -24,7 +25,6 @@
 #include <asm/btfixup.h>
 #include <asm/system.h>
 
-#ifndef __ASSEMBLY__
 
 struct vm_area_struct;
 struct page;
@@ -464,6 +464,11 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
 
 #endif /* !(__ASSEMBLY__) */
 
+#define VMALLOC_START           0xfe600000
+/* XXX Alter this when I get around to fixing sun4c - Anton */
+#define VMALLOC_END             0xffc00000
+
+
 /* We provide our own get_unmapped_area to cope with VA holes for userland */
 #define HAVE_ARCH_UNMAPPED_AREA
 

diff --git a/trunk/include/asm-sparc/vaddrs.h b/trunk/include/asm-sparc/vaddrs.h
@@ -34,11 +34,6 @@
 #define IOBASE_VADDR		0xfe000000
 #define IOBASE_END		0xfe600000
 
-#define VMALLOC_START		0xfe600000
-
-/* XXX Alter this when I get around to fixing sun4c - Anton */
-#define VMALLOC_END		0xffc00000
-
 /*
  * On the sun4/4c we need a place
  * to reliably map locked down kernel data.  This includes the