kernel: disable cfi cmdset 0002 erase suspend

[openwrt.git] / target / linux / generic / patches-3.0 / 950-vm_exports.patch

diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index b9e6f40..e1b88a0 100644 (file)
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -4905,6 +4905,7 @@ int can_nice(const struct task_struct *p
+@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
@@ -79,7 +79,7 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
-@@ -3015,6 +3016,7 @@ static inline int check_stack_guard_page
+@@ -3071,6 +3072,7 @@ static inline int check_stack_guard_page
        }
        return 0;
  }