]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
remove broken sysctl patch in .31 and .32
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Dec 2009 14:36:24 +0000 (06:36 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Dec 2009 14:36:24 +0000 (06:36 -0800)
review-2.6.31/series
review-2.6.31/sysctl_max_map_count-should-be-non-negative.patch [deleted file]
review-2.6.32/series
review-2.6.32/sysctl_max_map_count-should-be-non-negative.patch [deleted file]

index 1f9a69234085b884fdc929e90acdf5f07dc76441..3ea48448a2d26777432be285eca7b6c7e42d1e94 100644 (file)
@@ -84,7 +84,6 @@ ipw2100-fix-rebooting-hang-with-driver-loaded.patch
 jffs2-fix-long-standing-bug-with-symlink-garbage-collection.patch
 matroxfb-fix-problems-with-display-stability.patch
 net-fix-userspace-rtm_newlink-notifications.patch
-sysctl_max_map_count-should-be-non-negative.patch
 thinkpad-acpi-fix-default-brightness_mode-for-r50e-r51.patch
 thinkpad-acpi-preserve-rfkill-state-across-suspend-resume.patch
 v4l-dvb-13116-gspca-ov519-webcam-041e-4067-added.patch
diff --git a/review-2.6.31/sysctl_max_map_count-should-be-non-negative.patch b/review-2.6.31/sysctl_max_map_count-should-be-non-negative.patch
deleted file mode 100644 (file)
index a0ee409..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 70da2340fbc68e91e701762f785479ab495a0869 Mon Sep 17 00:00:00 2001
-From: Amerigo Wang <amwang@redhat.com>
-Date: Mon, 14 Dec 2009 17:59:52 -0800
-Subject: 'sysctl_max_map_count' should be non-negative
-
-From: Amerigo Wang <amwang@redhat.com>
-
-commit 70da2340fbc68e91e701762f785479ab495a0869 upstream.
-
-Jan Engelhardt reported we have this problem:
-
-setting max_map_count to a value large enough results in programs dying at
-first try.  This is on 2.6.31.6:
-
-15:59 borg:/proc/sys/vm # echo $[1<<31-1] >max_map_count
-15:59 borg:/proc/sys/vm # cat max_map_count
-1073741824
-15:59 borg:/proc/sys/vm # echo $[1<<31] >max_map_count
-15:59 borg:/proc/sys/vm # cat max_map_count
-Killed
-
-This is because we have a chance to make 'max_map_count' negative.  but
-it's meaningless.  Make it only accept non-negative values.
-
-Reported-by: Jan Engelhardt <jengelh@medozas.de>
-Signed-off-by: WANG Cong <amwang@redhat.com>
-Cc: Ingo Molnar <mingo@elte.hu>
-Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Cc: James Morris <jmorris@namei.org>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- kernel/sysctl.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -1539,7 +1539,8 @@ static struct ctl_table debug_table[] = 
-               .data           = &show_unhandled_signals,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
--              .proc_handler   = proc_dointvec
-+              .proc_handler   = proc_dointvec,
-+              .extra1         = &zero,
-       },
- #endif
-       { .ctl_name = 0 }
index a9b8ea0dde3677988145e996fc08b5595507d1a2..d8807f4b3dbdf18ca17a08c4da23fe487cacdd18 100644 (file)
@@ -123,7 +123,6 @@ drm-i915-fix-sync-to-vblank-when-vga-output-is-turned-off.patch
 memcg-fix-memory.memsw.usage_in_bytes-for-root-cgroup.patch
 thinkpad-acpi-fix-default-brightness_mode-for-r50e-r51.patch
 thinkpad-acpi-preserve-rfkill-state-across-suspend-resume.patch
-sysctl_max_map_count-should-be-non-negative.patch
 ipw2100-fix-rebooting-hang-with-driver-loaded.patch
 matroxfb-fix-problems-with-display-stability.patch
 acerhdf-add-new-bios-versions.patch
diff --git a/review-2.6.32/sysctl_max_map_count-should-be-non-negative.patch b/review-2.6.32/sysctl_max_map_count-should-be-non-negative.patch
deleted file mode 100644 (file)
index b515186..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 70da2340fbc68e91e701762f785479ab495a0869 Mon Sep 17 00:00:00 2001
-From: Amerigo Wang <amwang@redhat.com>
-Date: Mon, 14 Dec 2009 17:59:52 -0800
-Subject: 'sysctl_max_map_count' should be non-negative
-
-From: Amerigo Wang <amwang@redhat.com>
-
-commit 70da2340fbc68e91e701762f785479ab495a0869 upstream.
-
-Jan Engelhardt reported we have this problem:
-
-setting max_map_count to a value large enough results in programs dying at
-first try.  This is on 2.6.31.6:
-
-15:59 borg:/proc/sys/vm # echo $[1<<31-1] >max_map_count
-15:59 borg:/proc/sys/vm # cat max_map_count
-1073741824
-15:59 borg:/proc/sys/vm # echo $[1<<31] >max_map_count
-15:59 borg:/proc/sys/vm # cat max_map_count
-Killed
-
-This is because we have a chance to make 'max_map_count' negative.  but
-it's meaningless.  Make it only accept non-negative values.
-
-Reported-by: Jan Engelhardt <jengelh@medozas.de>
-Signed-off-by: WANG Cong <amwang@redhat.com>
-Cc: Ingo Molnar <mingo@elte.hu>
-Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Cc: James Morris <jmorris@namei.org>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- kernel/sysctl.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -1605,7 +1605,8 @@ static struct ctl_table debug_table[] = 
-               .data           = &show_unhandled_signals,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
--              .proc_handler   = proc_dointvec
-+              .proc_handler   = proc_dointvec,
-+              .extra1         = &zero,
-       },
- #endif
-       { .ctl_name = 0 }