The patch titled
Fix 'make headers_check' for Alpha
has been added to the -mm tree. Its filename is
fix-make-headers_check-for-alpha-in-2618.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix 'make headers_check' for Alpha
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Alpha currently fails 'make headers_check' in the 2.6.18-rc kernels. This
patch fixes it, by moving the existing #ifdef __KERNEL__ in asm/page.h so that
it covers everything that userspace shouldn't so, and by adding asm/compiler.h
to the list of exported files so that its use within asm/byteorder.h is
successful.
[ Note that at least with GCC 4, <linux/compiler.h> doesn't do the forced
inlining about which there are nasty comments (and a workaround) in
<asm/compiler.h>, unless you set CONFIG_FORCED_INLINING. Rather than keep
the mess you have in <asm/compiler.h> you could perhaps just make sure
CONFIG_FORCED_INLINING=n is also honoured with GCC3, and make sure it cannot
be set for Alpha? ]
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-alpha/Kbuild | 2 +-
include/asm-alpha/compiler.h | 3 +++
include/asm-alpha/page.h | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff -puN include/asm-alpha/Kbuild~fix-make-headers_check-for-alpha-in-2618 include/asm-alpha/Kbuild
--- a/include/asm-alpha/Kbuild~fix-make-headers_check-for-alpha-in-2618
+++ a/include/asm-alpha/Kbuild
@@ -1,5 +1,5 @@
include include/asm-generic/Kbuild.asm
-unifdef-y += console.h fpu.h sysinfo.h
+unifdef-y += console.h fpu.h sysinfo.h compiler.h
header-y += gentrap.h regdef.h pal.h reg.h
diff -puN include/asm-alpha/compiler.h~fix-make-headers_check-for-alpha-in-2618 include/asm-alpha/compiler.h
--- a/include/asm-alpha/compiler.h~fix-make-headers_check-for-alpha-in-2618
+++ a/include/asm-alpha/compiler.h
@@ -90,6 +90,7 @@
__asm__("stw %1,%0" : "=m"(mem) : "r"(val))
#endif
+#ifdef __KERNEL__
/* Some idiots over in <linux/compiler.h> thought inline should imply
always_inline. This breaks stuff. We'll include this file whenever
we run into such problems. */
@@ -101,4 +102,6 @@
#undef __always_inline
#define __always_inline inline __attribute__((always_inline))
+#endif /* __KERNEL__ */
+
#endif /* __ALPHA_COMPILER_H */
diff -puN include/asm-alpha/page.h~fix-make-headers_check-for-alpha-in-2618 include/asm-alpha/page.h
--- a/include/asm-alpha/page.h~fix-make-headers_check-for-alpha-in-2618
+++ a/include/asm-alpha/page.h
@@ -1,6 +1,8 @@
#ifndef _ALPHA_PAGE_H
#define _ALPHA_PAGE_H
+#ifdef __KERNEL__
+
#include <asm/pal.h>
/* PAGE_SHIFT determines the page size */
@@ -8,8 +10,6 @@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#ifndef __ASSEMBLY__
#define STRICT_MM_TYPECHECKS
@@ -92,9 +92,9 @@ 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/memory_model.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
#endif /* _ALPHA_PAGE_H */
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch
headers_check-remove-asm-timexh-from-user-export.patch
headers_check-move-inclusion-of-linux-linkageh-in.patch
headers_check-move-kernel-only-includes-within-asm-i386-elfh.patch
headers_check-dont-expose-pfn-stuff-to-userspace-in.patch
headers_check-fix-userspace-build-of-asm-mips-pageh.patch
fix-make-headers_check-on-biarch-architectures-for.patch
fix-make-headers_check-on-s390-for-2618.patch
fix-make-headers_check-on-ia64-for-2618.patch
fix-make-headers_check-on-x86_64-for-2618.patch
fix-make-headers_check-on-i386-for-2618.patch
arm-make-headers_check.patch
fix-make-headers_check-for-alpha-in-2618.patch
fix-make-headers_check-for-parisc-in-2618.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
pci-quirks-update.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
linux-magich-for-magic-numbers-headers_install-fix.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
