The patch titled
unexport asm/shmparam.h
has been removed from the -mm tree. Its filename was
unexport-asm-shmparamh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: unexport asm/shmparam.h
From: Olaf Hering <olaf@xxxxxxxxx>
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@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/Kbuild.asm | 1 -
include/asm-powerpc/Kbuild | 1 -
include/asm-sparc64/shmparam.h | 2 --
include/linux/shm.h | 2 ++
4 files changed, 2 insertions(+), 4 deletions(-)
diff -puN include/asm-generic/Kbuild.asm~unexport-asm-shmparamh include/asm-generic/Kbuild.asm
--- a/include/asm-generic/Kbuild.asm~unexport-asm-shmparamh
+++ a/include/asm-generic/Kbuild.asm
@@ -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
diff -puN include/asm-powerpc/Kbuild~unexport-asm-shmparamh include/asm-powerpc/Kbuild
--- a/include/asm-powerpc/Kbuild~unexport-asm-shmparamh
+++ a/include/asm-powerpc/Kbuild
@@ -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
diff -puN include/asm-sparc64/shmparam.h~unexport-asm-shmparamh include/asm-sparc64/shmparam.h
--- a/include/asm-sparc64/shmparam.h~unexport-asm-shmparamh
+++ a/include/asm-sparc64/shmparam.h
@@ -1,7 +1,6 @@
/* $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>
@@ -9,5 +8,4 @@
/* attach addr a multiple of this */
#define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)
-#endif /* __KERNEL__ */
#endif /* _ASMSPARC64_SHMPARAM_H */
diff -puN include/linux/shm.h~unexport-asm-shmparamh include/linux/shm.h
--- a/include/linux/shm.h~unexport-asm-shmparamh
+++ a/include/linux/shm.h
@@ -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 {
_
Patches currently in -mm which might be from olaf@xxxxxxxxx are
origin.patch
keep-track-of-network-interface-renaming.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
