generic: ar8216: set chip type directly in ar8216_id_chip

[openwrt.git] / target / linux / generic / patches-2.6.36 / 980-vm_exports.patch

diff --git a/target/linux/generic/patches-2.6.36/980-vm_exports.patch b/target/linux/generic/patches-2.6.36/980-vm_exports.patch
index d748b9b..0ac0999 100644 (file)
--- a/target/linux/generic/patches-2.6.36/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.36/980-vm_exports.patch
@@ -48,7 +48,7 @@
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c

-@@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st
+@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st

  
        return files;
  }
  
        return files;
  }


@@ -56,7 +56,7 @@
  
  void put_files_struct(struct files_struct *files)
  {
  
  void put_files_struct(struct files_struct *files)
  {

-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
+@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc

                rcu_read_unlock();
        }
  }
                rcu_read_unlock();
        }
  }


@@ -76,7 +76,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c

-@@ -4439,6 +4439,7 @@ int can_nice(const struct task_struct *p
+@@ -4567,6 +4567,7 @@ int can_nice(const struct task_struct *p

        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }