The patch titled
Fix 'make headers_check' on ia64
has been removed from the -mm tree. Its filename is
fix-make-headers_check-on-ia64-for-2618.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Fix 'make headers_check' on ia64
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote:
> asm-ia64/ptrace.h requires asm/asm-offsets.h, which does not exist
> asm-ia64/resource.h requires asm/ustack.h, which does not exist
Hide parts which shouldn't be visible to userspace.
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-ia64/Kbuild | 2 +-
include/asm-ia64/page.h | 4 ++--
include/asm-ia64/ptrace.h | 10 +++++++---
include/asm-ia64/ustack.h | 7 +++++--
4 files changed, 15 insertions(+), 8 deletions(-)
diff -puN include/asm-ia64/Kbuild~fix-make-headers_check-on-ia64-for-2618 include/asm-ia64/Kbuild
--- a/include/asm-ia64/Kbuild~fix-make-headers_check-on-ia64-for-2618
+++ a/include/asm-ia64/Kbuild
@@ -4,4 +4,4 @@ header-y += break.h fpu.h fpswa.h gcc_in
intel_intrin.h intrinsics.h perfmon_default_smpl.h \
ptrace_offsets.h rse.h setup.h ucontext.h
-unifdef-y += perfmon.h
+unifdef-y += perfmon.h ustack.h
diff -puN include/asm-ia64/page.h~fix-make-headers_check-on-ia64-for-2618 include/asm-ia64/page.h
--- a/include/asm-ia64/page.h~fix-make-headers_check-on-ia64-for-2618
+++ a/include/asm-ia64/page.h
@@ -7,6 +7,7 @@
* David Mosberger-Tang <davidm@xxxxxxxxxx>
*/
+# ifdef __KERNEL__
#include <asm/intrinsics.h>
#include <asm/types.h>
@@ -64,7 +65,6 @@
# define __pa(x) ((x) - PAGE_OFFSET)
# define __va(x) ((x) + PAGE_OFFSET)
#else /* !__ASSEMBLY */
-# ifdef __KERNEL__
# define STRICT_MM_TYPECHECKS
extern void clear_page (void *page);
@@ -174,7 +174,6 @@ get_order (unsigned long size)
return order;
}
-# endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */
#ifdef STRICT_MM_TYPECHECKS
@@ -228,4 +227,5 @@ get_order (unsigned long size)
(((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0))
+# endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */
diff -puN include/asm-ia64/ptrace.h~fix-make-headers_check-on-ia64-for-2618 include/asm-ia64/ptrace.h
--- a/include/asm-ia64/ptrace.h~fix-make-headers_check-on-ia64-for-2618
+++ a/include/asm-ia64/ptrace.h
@@ -56,6 +56,8 @@
#include <asm/fpu.h>
+
+#ifdef __KERNEL__
#ifndef ASM_OFFSETS_C
#include <asm/asm-offsets.h>
#endif
@@ -79,10 +81,9 @@
#define KERNEL_STACK_SIZE IA64_STK_OFFSET
-#ifndef __ASSEMBLY__
+#endif /* __KERNEL__ */
-#include <asm/current.h>
-#include <asm/page.h>
+#ifndef __ASSEMBLY__
/*
* This struct defines the way the registers are saved on system
@@ -229,6 +230,9 @@ struct switch_stack {
#ifdef __KERNEL__
+#include <asm/current.h>
+#include <asm/page.h>
+
#define __ARCH_SYS_PTRACE 1
/*
diff -puN include/asm-ia64/ustack.h~fix-make-headers_check-on-ia64-for-2618 include/asm-ia64/ustack.h
--- a/include/asm-ia64/ustack.h~fix-make-headers_check-on-ia64-for-2618
+++ a/include/asm-ia64/ustack.h
@@ -5,12 +5,15 @@
* Constants for the user stack size
*/
+#ifdef __KERNEL__
#include <asm/page.h>
/* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
#define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2)
-/* Make a default stack size of 2GB */
-#define DEFAULT_USER_STACK_SIZE (1UL << 31)
#define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT)
+#endif
+
+/* Make a default stack size of 2GiB */
+#define DEFAULT_USER_STACK_SIZE (1UL << 31)
#endif /* _ASM_IA64_USTACK_H */
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
origin.patch
add-headers_check-target-to-output-of-make-help.patch
fix-make-headers_check-on-m68k.patch
headers_check-clean-up-asm-parisc-pageh-for-user-headers.patch
git-gfs2.patch
git-mtd.patch
mtd-maps-ixp4xx-partition-parsing.patch
fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch
mtd-printk-format-warning.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-mtd-nand-au1550ndc-removal-of-old-code.patch
git-parisc.patch
pci-quirks-update.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-unlock-flash-if-necessary-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch
avr32-mtd-unlock-flash-if-necessary.patch
split-i386-and-x86_64-ptraceh.patch
split-i386-and-x86_64-ptraceh-fix.patch
make-uml-use-ptrace-abih.patch
fs-conversions-from-kmallocmemset-to-kzcalloc.patch
add-config_headers_check-option-to-automatically-run-make-headers_check.patch
pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
debug-shared-irqs.patch
debug-shared-irqs-kconfig-fix.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
