- drop fixes that are already in grsec patch

Changed files:
    kernel-grsec_fixes.patch -> 1.29
    kernel-small_fixes.patch -> 1.47

diff --git a/kernel-grsec_fixes.patch b/kernel-grsec_fixes.patch
index 2aec5690c69ebf15b18472303a9df1cc02ca3972..8899c951e9f0bcbe0e00a6e6d576e607d1d0ff2b 100644 (file)
--- a/kernel-grsec_fixes.patch
+++ b/kernel-grsec_fixes.patch
@@ -120,19 +120,6 @@ diff -upr a/security/commoncap.c c/security/commoncap.c
                sock_release(newsock);
 
 
-diff -NurpX linux-3.0.6-pax/Documentation/dontdiff linux-3.0.6/drivers/media/video/timblogiw.c linux-3.0.6-pax/drivers/media/video/timblogiw.c
---- linux-3.0.6/drivers/media/video/timblogiw.c        2011-07-22 04:17:23.000000000 +0200
-+++ linux-3.0.6-pax/drivers/media/video/timblogiw.c    2011-10-09 13:14:45.187928072 +0200
-@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_
-       .vidioc_enum_framesizes         = timblogiw_enum_framesizes,
- };
- 
--static __devinitconst struct v4l2_file_operations timblogiw_fops = {
-+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
-       .owner          = THIS_MODULE,
-       .open           = timblogiw_open,
-       .release        = timblogiw_close,
-
 --- linux-3.0/include/linux/vermagic.h~        2011-10-14 19:55:36.000000000 +0200
 +++ linux-3.0/include/linux/vermagic.h 2011-10-16 15:45:11.251098590 +0200
 @@ -33,7 +33,7 @@

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d9ab7f775360561833ac455b5bf223438aad7f19..8a3f5fa4278e617e4046c260540e2a878854a8b9 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -153,61 +153,4 @@ Please read the FAQ at  http://www.tux.org/lkml/
                done
 
 
-An integer overflow will happen on 64bit archs if task's sum of rss, swapents
-and nr_ptes exceeds (2^31)/1000 value. This was introduced by commit
-
-f755a04 oom: use pte pages in OOM score
-
-where the oom score computation was divided into several steps and it's no
-longer computed as one expression in unsigned long(rss, swapents, nr_pte are
-unsigned long), where the result value assigned to points(int) is in
-range(1..1000). So there could be an int overflow while computing
-
-176          points *= 1000;
-
-and points may have negative value. Meaning the oom score for a mem hog task
-will be one.
-
-196          if (points <= 0)
-197                  return 1;
-
-For example:
-[ 3366]     0  3366 35390480 24303939   5       0             0 oom01
-Out of memory: Kill process 3366 (oom01) score 1 or sacrifice child
-
-Here the oom1 process consumes more than 24303939(rss)*4096~=92GB physical
-memory, but it's oom score is one.
-
-In this situation the mem hog task is skipped and oom killer kills another and
-most probably innocent task with oom score greater than one.
-
-The points variable should be of type long instead of int to prevent the int
-overflow.
-
-Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
----
- mm/oom_kill.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 626303b..e9a1785 100644
---- a/mm/oom_kill.c
-+++ b/mm/oom_kill.c
-@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct task_struct *p,
- unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
-                     const nodemask_t *nodemask, unsigned long totalpages)
- {
--      int points;
-+      long points;
- 
-       if (oom_unkillable_task(p, mem, nodemask))
-               return 0;
--- 
-1.7.6.4
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/