Skip to content

Commit

Permalink
unexport asm/shmparam.h
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: "David S. Miller" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
olafhering authored and Linus Torvalds committed Oct 17, 2007
1 parent eb1f293 commit 4029a91
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion include/asm-generic/Kbuild.asm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ unifdef-y += unistd.h
unifdef-y += user.h

# These probably shouldn't be exported
unifdef-y += shmparam.h
unifdef-y += elf.h
unifdef-y += page.h
1 change: 0 additions & 1 deletion include/asm-powerpc/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ header-y += termbits.h
header-y += fcntl.h
header-y += ipc.h
header-y += poll.h
header-y += shmparam.h
header-y += sockios.h
header-y += ucontext.h
header-y += ioctl.h
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sparc64/shmparam.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/* $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>

#define __ARCH_FORCE_SHMLBA 1
/* attach addr a multiple of this */
#define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)

#endif /* __KERNEL__ */
#endif /* _ASMSPARC64_SHMPARAM_H */
2 changes: 2 additions & 0 deletions include/linux/shm.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */
#define SHMSEG SHMMNI /* max shared segs per process */

#ifdef __KERNEL__
#include <asm/shmparam.h>
#endif

/* Obsolete, used only for backwards compatibility and libc5 compiles */
struct shmid_ds {
Expand Down

0 comments on commit 4029a91

Please sign in to comment.