aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2007-10-17 02:26:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:47 -0400
commit4029a9177fb4a3410211d091505a7f8d03a7b15d (patch)
tree0ecad3a0799acf1ed59e527790e1b9e3ebee0995
parenteb1f2930609bb01bb3a970f145b5004e5163742a (diff)
unexport asm/shmparam.h
SHMLBA cant possible be used in userspace, see sparc versions of that header. Do not export asm/shmparam.h during make headers_install_all This removes another uservisible place of PAGE_SIZE Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-generic/Kbuild.asm1
-rw-r--r--include/asm-powerpc/Kbuild1
-rw-r--r--include/asm-sparc64/shmparam.h2
-rw-r--r--include/linux/shm.h2
4 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index a37e95fe58d6..8fd81713cfc0 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -30,6 +30,5 @@ unifdef-y += unistd.h
30unifdef-y += user.h 30unifdef-y += user.h
31 31
32# These probably shouldn't be exported 32# These probably shouldn't be exported
33unifdef-y += shmparam.h
34unifdef-y += elf.h 33unifdef-y += elf.h
35unifdef-y += page.h 34unifdef-y += page.h
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
index 4869513b872f..626212c0fd6c 100644
--- a/include/asm-powerpc/Kbuild
+++ b/include/asm-powerpc/Kbuild
@@ -15,7 +15,6 @@ header-y += termbits.h
15header-y += fcntl.h 15header-y += fcntl.h
16header-y += ipc.h 16header-y += ipc.h
17header-y += poll.h 17header-y += poll.h
18header-y += shmparam.h
19header-y += sockios.h 18header-y += sockios.h
20header-y += ucontext.h 19header-y += ucontext.h
21header-y += ioctl.h 20header-y += ioctl.h
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h
index 911d0427de6d..8c66fded8a32 100644
--- a/include/asm-sparc64/shmparam.h
+++ b/include/asm-sparc64/shmparam.h
@@ -1,7 +1,6 @@
1/* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */ 1/* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */
2#ifndef _ASMSPARC64_SHMPARAM_H 2#ifndef _ASMSPARC64_SHMPARAM_H
3#define _ASMSPARC64_SHMPARAM_H 3#define _ASMSPARC64_SHMPARAM_H
4#ifdef __KERNEL__
5 4
6#include <asm/spitfire.h> 5#include <asm/spitfire.h>
7 6
@@ -9,5 +8,4 @@
9/* attach addr a multiple of this */ 8/* attach addr a multiple of this */
10#define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE) 9#define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)
11 10
12#endif /* __KERNEL__ */
13#endif /* _ASMSPARC64_SHMPARAM_H */ 11#endif /* _ASMSPARC64_SHMPARAM_H */
diff --git a/include/linux/shm.h b/include/linux/shm.h
index ad2e3af65997..bea65d9c93ef 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -16,7 +16,9 @@
16#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */ 16#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */
17#define SHMSEG SHMMNI /* max shared segs per process */ 17#define SHMSEG SHMMNI /* max shared segs per process */
18 18
19#ifdef __KERNEL__
19#include <asm/shmparam.h> 20#include <asm/shmparam.h>
21#endif
20 22
21/* Obsolete, used only for backwards compatibility and libc5 compiles */ 23/* Obsolete, used only for backwards compatibility and libc5 compiles */
22struct shmid_ds { 24struct shmid_ds {