The patch titled
headers_check: fix userspace build of asm-mips/page.h
has been removed from the -mm tree. Its filename is
headers_check-fix-userspace-build-of-asm-mips-pageh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: headers_check: fix userspace build of asm-mips/page.h
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
MIPS asm/page.h unconditionally includes <asm-generic/memory_model.h>, which
doesn't exist in userspace. Move an #endif /* __KERNEL__ */ down a few lines
to prevent that.
Also, remove the broken definition of PAGE_SIZE which is never going to be
correct -- in the absence of PAGE_SIZE, non-broken userspace will fall back to
using sysconf() or getpagesize() instead.
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-mips/page.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN include/asm-mips/page.h~headers_check-fix-userspace-build-of-asm-mips-pageh include/asm-mips/page.h
--- a/include/asm-mips/page.h~headers_check-fix-userspace-build-of-asm-mips-pageh
+++ a/include/asm-mips/page.h
@@ -14,8 +14,6 @@
#include <spaces.h>
-#endif
-
/*
* PAGE_SHIFT determines the page size
*/
@@ -34,8 +32,6 @@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
-
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
extern void clear_page(void * page);
@@ -168,8 +164,6 @@ typedef struct { unsigned long pgprot; }
#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
-#endif /* defined (__KERNEL__) */
-
#ifdef CONFIG_LIMITED_DMA
#define WANT_PAGE_VIRTUAL
#endif
@@ -177,4 +171,6 @@ typedef struct { unsigned long pgprot; }
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#endif /* defined (__KERNEL__) */
+
#endif /* _ASM_PAGE_H */
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
origin.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
fix-make-headers_check-for-alpha-in-2618.patch
headers_check-use-a-different-default-directory.patch
mtd-nand-oob-buffer-offset-fixups.patch
jffs2-summary-fix-a-summary-collecting-bug.patch
arm-make-headers_check.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
fix-make-headers_check-for-parisc-in-2618.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
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
