The patch titled
headers_check: Clean up asm-parisc/page.h for user headers
has been removed from the -mm tree. Its filename is
headers_check-clean-up-asm-parisc-pageh-for-user-headers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: headers_check: Clean up asm-parisc/page.h for user headers
From: Matthew Wilcox <matthew@xxxxxx>
Remove definitions of PAGE_* from the user view
Delete unnecessary comments referring to the size of pages
Only include <asm-generic> if we're in __KERNEL__
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Matthew Wilcox <matthew@xxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-parisc/page.h | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff -puN include/asm-parisc/page.h~headers_check-clean-up-asm-parisc-pageh-for-user-headers include/asm-parisc/page.h
--- a/include/asm-parisc/page.h~headers_check-clean-up-asm-parisc-pageh-for-user-headers
+++ 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
#elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
-# define PAGE_SHIFT 14 /* 16k */
+# define PAGE_SHIFT 14
#elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
-# define PAGE_SHIFT 16 /* 64k */
+# define PAGE_SHIFT 16
#else
# error "unknown default kernel page size"
#endif
@@ -188,9 +180,9 @@ 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 matthew@xxxxxx are
git-kbuild.patch
git-parisc.patch
git-scsi-misc.patch
superh-list-is-moderated.patch
make-sure-nobodys-leaking-resources.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
