summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-21 08:48:27 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-09-21 08:48:27 +0100
commit09087a1a8722fac30b1969a4a542cde064af13f8 (patch)
treef49a0f35ea85e2756c147269da11c8526112cbbf /include/asm-sparc64
parent47dbec79d1b9ce9e80bed932f345adc92049f05d (diff)
downloadop-kernel-dev-09087a1a8722fac30b1969a4a542cde064af13f8.zip
op-kernel-dev-09087a1a8722fac30b1969a4a542cde064af13f8.tar.gz
Fix exported headers for SPARC, SPARC64
Mostly removing files which have no business being used in userspace. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r--include/asm-sparc64/Kbuild5
-rw-r--r--include/asm-sparc64/page.h9
-rw-r--r--include/asm-sparc64/shmparam.h2
3 files changed, 7 insertions, 9 deletions
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
index 4b59ce4..a7f4440 100644
--- a/include/asm-sparc64/Kbuild
+++ b/include/asm-sparc64/Kbuild
@@ -8,15 +8,12 @@ header-y += apb.h
header-y += asi.h
header-y += bbc.h
header-y += bpp.h
+header-y += const.h
header-y += display7seg.h
header-y += envctrl.h
-header-y += floppy.h
header-y += ipc.h
-header-y += kdebug.h
-header-y += mostek.h
header-y += openprom.h
header-y += openpromio.h
-header-y += parport.h
header-y += pconf.h
header-y += psrcompat.h
header-y += pstate.h
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
index fdf0ceb..ff736ea 100644
--- a/include/asm-sparc64/page.h
+++ b/include/asm-sparc64/page.h
@@ -3,6 +3,8 @@
#ifndef _SPARC64_PAGE_H
#define _SPARC64_PAGE_H
+#ifdef __KERNEL__
+
#include <asm/const.h>
#if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
@@ -27,8 +29,6 @@
#define DCACHE_ALIASING_POSSIBLE
#endif
-#ifdef __KERNEL__
-
#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
#define HPAGE_SHIFT 22
#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
@@ -141,8 +141,7 @@ typedef unsigned long pgprot_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* !(__KERNEL__) */
-
#include <asm-generic/page.h>
-#endif /* !(_SPARC64_PAGE_H) */
+#endif /* __KERNEL__ */
+#endif /* _SPARC64_PAGE_H */
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h
index 8c66fde..911d042 100644
--- a/include/asm-sparc64/shmparam.h
+++ b/include/asm-sparc64/shmparam.h
@@ -1,6 +1,7 @@
/* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */
#ifndef _ASMSPARC64_SHMPARAM_H
#define _ASMSPARC64_SHMPARAM_H
+#ifdef __KERNEL__
#include <asm/spitfire.h>
@@ -8,4 +9,5 @@
/* attach addr a multiple of this */
#define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)
+#endif /* __KERNEL__ */
#endif /* _ASMSPARC64_SHMPARAM_H */
OpenPOWER on IntegriCloud