diff for duplicates of <200909182120.n8ILKUo8004823@imap1.linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index f1c2f72..fb36a80 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -295,3 +295,23 @@ diff -puN arch/s390/include/asm/mman.h~mm-remove-duplicate-asm-mmanh-files arch/ -#define MAP_NONBLOCK 0x10000 /* do not block on IO */ -#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ -#define MAP_HUGETLB 0x40000 /* create a huge page mapping */ +- +-#define MCL_CURRENT 1 /* lock all current mappings */ +-#define MCL_FUTURE 2 /* lock all future mappings */ ++#include <asm-generic/mman.h> + + #if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT) + int s390_mmap_check(unsigned long addr, unsigned long len); +_ + +Patches currently in -mm which might be from arnd@arndb.de are + +origin.patch +linux-next.patch +mm-add-map_hugetlb-for-mmaping-pseudo-anonymous-huge-page-regions.patch +hugetlb-add-map_hugetlb-for-mmaping-pseudo-anonymous-huge-page-regions-fix.patch +mm-remove-duplicate-asm-mmanh-files.patch +asm-sections-add-text-data-checking-functions-for-arches-to-override.patch +kallsyms-use-new-arch_is_kernel_text.patch +lockdep-use-new-arch_is_kernel_data.patch +blackfin-override-text-data-checking-functions.patch diff --git a/a/content_digest b/N1/content_digest index caef981..8d7308c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -302,6 +302,26 @@ "-#define MAP_POPULATE\t0x8000\t\t/* populate (prefault) pagetables */\n" "-#define MAP_NONBLOCK\t0x10000\t\t/* do not block on IO */\n" "-#define MAP_STACK\t0x20000\t\t/* give out an address that is best suited for process/thread stacks */\n" - "-#define MAP_HUGETLB\t0x40000\t\t/* create a huge page mapping */" + "-#define MAP_HUGETLB\t0x40000\t\t/* create a huge page mapping */\n" + "-\n" + "-#define MCL_CURRENT\t1\t\t/* lock all current mappings */\n" + "-#define MCL_FUTURE\t2\t\t/* lock all future mappings */\n" + "+#include <asm-generic/mman.h>\n" + " \n" + " #if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)\n" + " int s390_mmap_check(unsigned long addr, unsigned long len);\n" + "_\n" + "\n" + "Patches currently in -mm which might be from arnd@arndb.de are\n" + "\n" + "origin.patch\n" + "linux-next.patch\n" + "mm-add-map_hugetlb-for-mmaping-pseudo-anonymous-huge-page-regions.patch\n" + "hugetlb-add-map_hugetlb-for-mmaping-pseudo-anonymous-huge-page-regions-fix.patch\n" + "mm-remove-duplicate-asm-mmanh-files.patch\n" + "asm-sections-add-text-data-checking-functions-for-arches-to-override.patch\n" + "kallsyms-use-new-arch_is_kernel_text.patch\n" + "lockdep-use-new-arch_is_kernel_data.patch\n" + blackfin-override-text-data-checking-functions.patch -73dda75161b4c4d16c122fcfab89a84257c00bca493e62e68ee0f0f9a4255741 +cd95b457b0fcf98b6f7539f61dbb9536f8e1b8f17a89e7aafd10d5d84961d554
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox