sparc: export openprom.h to userspace

sparc64 exports openprom.h to userspace so let sparc follow
the example.
As openprom.h pulled in another not-for-export vaddrs.h header
file it required a few changes to fix the build.

The definition af VMALLOC_* were moved to pgtable as this is
where sparc64 has them.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 55d3be1b5d818dcfd965d966e5f1563c3890f97a..2f96256dc5153bf04e06b176bff63da240495c3f 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/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/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
index c8432483628eb645ae56cd3560412d1dff63f460..c83e3c0aa30b421c8140d7363e0363c36318e5e8 100644 (file)
--- a/include/asm-sparc/Kbuild
+++ b/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/include/asm-sparc/openprom.h b/include/asm-sparc/openprom.h
index ed4b6bc2b1020682479b60a35eef21e94c0ba0b3..e812cf3b0de7e17200b244d9855738f5d1d37e75 100644 (file)
--- a/include/asm-sparc/openprom.h
+++ b/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/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index 60512296b2ca9468b04b174d61a867cf9c954680..b63ac6b4119f6c79b729025a28a816b9617fbbc4 100644 (file)
--- a/include/asm-sparc/pgtable.h
+++ b/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/include/asm-sparc/vaddrs.h b/include/asm-sparc/vaddrs.h
index f6ca4779056cc97402c0f10a5d328c6a71935aeb..a22fed5a3c6bef64d9b0d6eb75e9699e81754a68 100644 (file)
--- a/include/asm-sparc/vaddrs.h
+++ b/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