The patch titled
Subject: coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix
has been removed from the -mm tree. Its filename was
coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix.patch
This patch was dropped because it was folded into coredump-add-vm_nodump-madv_nodump-madv_clear_nodump.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix
s/MADV_NODUMP/MADV_DONTDUMP/, s/MADV_CLEAR_NODUMP/MADV_DODUMP/, per Roland
Cc: Avi Kivity <avi@xxxxxxxxxx>
Cc: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/mman-common.h | 4 ++--
mm/madvise.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff -puN include/asm-generic/mman-common.h~coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix include/asm-generic/mman-common.h
--- a/include/asm-generic/mman-common.h~coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix
+++ a/include/asm-generic/mman-common.h
@@ -48,9 +48,9 @@
#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */
#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
-#define MADV_NODUMP 16 /* Explicity exclude from the core dump,
+#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
overrides the coredump filter bits */
-#define MADV_CLEAR_NODUMP 17 /* Clear the MADV_NODUMP flag */
+#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
/* compatibility flags */
#define MAP_FILE 0
diff -puN mm/madvise.c~coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix mm/madvise.c
--- a/mm/madvise.c~coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix
+++ a/mm/madvise.c
@@ -65,10 +65,10 @@ static long madvise_behavior(struct vm_a
}
new_flags &= ~VM_DONTCOPY;
break;
- case MADV_NODUMP:
+ case MADV_DONTDUMP:
new_flags |= VM_NODUMP;
break;
- case MADV_CLEAR_NODUMP:
+ case MADV_DODUMP:
new_flags &= ~VM_NODUMP;
break;
case MADV_MERGEABLE:
@@ -299,8 +299,8 @@ madvise_behavior_valid(int behavior)
case MADV_HUGEPAGE:
case MADV_NOHUGEPAGE:
#endif
- case MADV_NODUMP:
- case MADV_CLEAR_NODUMP:
+ case MADV_DONTDUMP:
+ case MADV_DODUMP:
return 1;
default:
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision.patch
kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any.patch
kernel-watchdogc-convert-to-pr_foo.patch
kernel-watchdogc-add-comment-to-watchdog-exit-path.patch
backlight-use-id-driver_data-to-differentiate-lp855x-chips.patch
backlight-add-driver-for-bachmanns-ot200.patch
leds-lp5521-support-led-pattern-data.patch
drivers-leds-leds-lp5523c-constify-some-data.patch
drivers-leds-add-driver-for-pca9663-i2c-chip.patch
leds-lm3530-replace-i2c_client-with-led_classdev.patch
drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place.patch
crc32-move-long-comment-about-crc32-fundamentals-to-documentation.patch
rtc-rtc-driver-for-da9052-53-pmic-v1.patch
coredump-add-vm_nodump-madv_nodump-madv_clear_nodump.patch
coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix-fix.patch
procfs-add-num_to_str-to-speed-up-proc-stat-fix.patch
procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes.patch
seq_file-add-seq_set_overflow-seq_overflow-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
