]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
refresh queue against 2.6.21.6
authorChris Wright <chrisw@sous-sol.org>
Tue, 10 Jul 2007 03:00:19 +0000 (20:00 -0700)
committerChris Wright <chrisw@sous-sol.org>
Tue, 10 Jul 2007 03:00:19 +0000 (20:00 -0700)
queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch
queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch
queue-2.6.21/hpt366-disallow-ultra133-for-hpt374.patch
queue-2.6.21/pi-futex-fix-exit-races-and-locking-problems.patch
queue-2.6.21/rt-mutex-fix-chain-walk-early-wakeup-bug.patch
queue-2.6.21/rt-mutex-fix-stale-return-value.patch

index 792c1c08deabeac8bd0248dd411427c764d5072e..e864c4e4ae163b355771b03f7abc1011f53c7e46 100644 (file)
@@ -21,8 +21,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/net/bnx2.c |   25 +++++++++++++++----------
  1 file changed, 15 insertions(+), 10 deletions(-)
 
---- linux-2.6.21.5.orig/drivers/net/bnx2.c
-+++ linux-2.6.21.5/drivers/net/bnx2.c
+--- linux-2.6.21.6.orig/drivers/net/bnx2.c
++++ linux-2.6.21.6/drivers/net/bnx2.c
 @@ -54,8 +54,8 @@
  
  #define DRV_MODULE_NAME               "bnx2"
index 801e0d39d9e44d6e7b49ac6820075f4c380209f9..0d94db7e06c5f761acf43dbc346e8325d80e92e4 100644 (file)
@@ -26,8 +26,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  arch/x86_64/mm/init.c |    2 ++
  1 file changed, 2 insertions(+)
 
---- linux-2.6.21.5.orig/arch/x86_64/mm/init.c
-+++ linux-2.6.21.5/arch/x86_64/mm/init.c
+--- linux-2.6.21.6.orig/arch/x86_64/mm/init.c
++++ linux-2.6.21.6/arch/x86_64/mm/init.c
 @@ -72,6 +72,8 @@ void show_mem(void)
  
        for_each_online_pgdat(pgdat) {
index 9116283b7a04d3da1bf9030b961d7b7ff95d09e7..34cc6b4b3a0fe433f43b9018327c4dfac8304ec1 100644 (file)
@@ -14,8 +14,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/ide/pci/hpt366.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
---- linux-2.6.21.5.orig/drivers/ide/pci/hpt366.c
-+++ linux-2.6.21.5/drivers/ide/pci/hpt366.c
+--- linux-2.6.21.6.orig/drivers/ide/pci/hpt366.c
++++ linux-2.6.21.6/drivers/ide/pci/hpt366.c
 @@ -1,5 +1,5 @@
  /*
 - * linux/drivers/ide/pci/hpt366.c             Version 1.03    May 4, 2007
index 1fe614b17a039f358364a416c3faf200c92f9bfe..6e94cffaf4305a8ef440b1d88251b425a14cc314 100644 (file)
@@ -67,8 +67,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  kernel/futex.c        |  191 +++++++++++++++++++++++++++++++++-----------------
  3 files changed, 150 insertions(+), 64 deletions(-)
 
---- linux-2.6.21.5.orig/kernel/futex.c
-+++ linux-2.6.21.5/kernel/futex.c
+--- linux-2.6.21.6.orig/kernel/futex.c
++++ linux-2.6.21.6/kernel/futex.c
 @@ -396,10 +396,6 @@ static struct task_struct * futex_find_g
                p = NULL;
                goto out_unlock;
@@ -388,8 +388,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
        up_read(&current->mm->mmap_sem);
  
        ret = get_user(uval, uaddr);
---- linux-2.6.21.5.orig/include/linux/sched.h
-+++ linux-2.6.21.5/include/linux/sched.h
+--- linux-2.6.21.6.orig/include/linux/sched.h
++++ linux-2.6.21.6/include/linux/sched.h
 @@ -1138,6 +1138,7 @@ static inline void put_task_struct(struc
                                        /* Not implemented yet, only for 486*/
  #define PF_STARTING   0x00000002      /* being created */
@@ -398,8 +398,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  #define PF_FORKNOEXEC 0x00000040      /* forked but didn't exec */
  #define PF_SUPERPRIV  0x00000100      /* used super-user privileges */
  #define PF_DUMPCORE   0x00000200      /* dumped core */
---- linux-2.6.21.5.orig/kernel/exit.c
-+++ linux-2.6.21.5/kernel/exit.c
+--- linux-2.6.21.6.orig/kernel/exit.c
++++ linux-2.6.21.6/kernel/exit.c
 @@ -884,13 +884,29 @@ fastcall NORET_TYPE void do_exit(long co
        if (unlikely(tsk->flags & PF_EXITING)) {
                printk(KERN_ALERT
index 5be8c6493cbfce9200c350eb605a66c048a5e7f2..da64c65c527941aea7eef1fbe13a73970907cf42 100644 (file)
@@ -24,8 +24,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  kernel/rtmutex.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
---- linux-2.6.21.5.orig/kernel/rtmutex.c
-+++ linux-2.6.21.5/kernel/rtmutex.c
+--- linux-2.6.21.6.orig/kernel/rtmutex.c
++++ linux-2.6.21.6/kernel/rtmutex.c
 @@ -212,6 +212,19 @@ static int rt_mutex_adjust_prio_chain(st
        if (!waiter || !waiter->task)
                goto out_unlock_pi;
index 771cb0e59569b71f01a8f6906f703db766c4f5db..e3029f2ca7000a94a4f2d764ca42110dda8ec4bb 100644 (file)
@@ -26,8 +26,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  kernel/rtmutex.c |   11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.5.orig/kernel/rtmutex.c
-+++ linux-2.6.21.5/kernel/rtmutex.c
+--- linux-2.6.21.6.orig/kernel/rtmutex.c
++++ linux-2.6.21.6/kernel/rtmutex.c
 @@ -659,9 +659,16 @@ rt_mutex_slowlock(struct rt_mutex *lock,
                         * all over without going into schedule to try
                         * to get the lock now: