The patch titled
Fix 'make headers_check' for PARISC
has been added to the -mm tree. Its filename is
fix-make-headers_check-for-parisc-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 PARISC
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Running 'make headers_check' with the 2.6.18-rc7 kernel gives this error
on parisc:
CHECK include/asm/page.h
/tmp/khdr-parisc/include/asm/page.h requires asm-generic/memory_model.h,
which does not exist in exported headers
The patch also removes some gratuitous and probably incorrect noise within
#ifndef __KERNEL__, and corrects a some comments.
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-parisc/page.h | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff -puN include/asm-parisc/page.h~fix-make-headers_check-for-parisc-in-2618 include/asm-parisc/page.h
--- a/include/asm-parisc/page.h~fix-make-headers_check-for-parisc-in-2618
+++ a/include/asm-parisc/page.h
@@ -1,22 +1,14 @@
#ifndef _PARISC_PAGE_H
#define _PARISC_PAGE_H
-#if !defined(__KERNEL__)
-/* this is for userspace applications (4k page size) */
-# define PAGE_SHIFT 12 /* 4k */
-# define PAGE_SIZE (1UL << PAGE_SHIFT)
-# define PAGE_MASK (~(PAGE_SIZE-1))
-#endif
-
-
#ifdef __KERNEL__
#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
-# define PAGE_SHIFT 12 /* 4k */
+# define PAGE_SHIFT 12 /* 4KiB */
#elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
-# define PAGE_SHIFT 14 /* 16k */
+# define PAGE_SHIFT 14 /* 16KiB */
#elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
-# define PAGE_SHIFT 16 /* 64k */
+# define PAGE_SHIFT 16 /* 64KiB */
#else
# error "unknown default kernel page size"
#endif
@@ -188,9 +180,8 @@ extern int npmem_ranges;
#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 /* _PARISC_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
