From 21f8e0587cb7f52bdfbf0c438d5d984e4d802abc Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 9 Jul 2007 20:00:19 -0700 Subject: [PATCH] refresh queue against 2.6.21.6 --- queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch | 4 ++-- queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch | 4 ++-- .../hpt366-disallow-ultra133-for-hpt374.patch | 4 ++-- ...i-futex-fix-exit-races-and-locking-problems.patch | 12 ++++++------ .../rt-mutex-fix-chain-walk-early-wakeup-bug.patch | 4 ++-- queue-2.6.21/rt-mutex-fix-stale-return-value.patch | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch b/queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch index 792c1c08dea..e864c4e4ae1 100644 --- a/queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch +++ b/queue-2.6.21/bnx2-fix-netdev-watchdog-on-5708.patch @@ -21,8 +21,8 @@ Signed-off-by: Chris Wright 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" diff --git a/queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch b/queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch index 801e0d39d9e..0d94db7e06c 100644 --- a/queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch +++ b/queue-2.6.21/fix-show_mem-x86_64-sparsemem.patch @@ -26,8 +26,8 @@ Signed-off-by: Chris Wright 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) { diff --git a/queue-2.6.21/hpt366-disallow-ultra133-for-hpt374.patch b/queue-2.6.21/hpt366-disallow-ultra133-for-hpt374.patch index 9116283b7a0..34cc6b4b3a0 100644 --- a/queue-2.6.21/hpt366-disallow-ultra133-for-hpt374.patch +++ b/queue-2.6.21/hpt366-disallow-ultra133-for-hpt374.patch @@ -14,8 +14,8 @@ Signed-off-by: Chris Wright 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 diff --git a/queue-2.6.21/pi-futex-fix-exit-races-and-locking-problems.patch b/queue-2.6.21/pi-futex-fix-exit-races-and-locking-problems.patch index 1fe614b17a0..6e94cffaf43 100644 --- a/queue-2.6.21/pi-futex-fix-exit-races-and-locking-problems.patch +++ b/queue-2.6.21/pi-futex-fix-exit-races-and-locking-problems.patch @@ -67,8 +67,8 @@ Signed-off-by: Chris Wright 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 up_read(¤t->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 #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 diff --git a/queue-2.6.21/rt-mutex-fix-chain-walk-early-wakeup-bug.patch b/queue-2.6.21/rt-mutex-fix-chain-walk-early-wakeup-bug.patch index 5be8c6493cb..da64c65c527 100644 --- a/queue-2.6.21/rt-mutex-fix-chain-walk-early-wakeup-bug.patch +++ b/queue-2.6.21/rt-mutex-fix-chain-walk-early-wakeup-bug.patch @@ -24,8 +24,8 @@ Signed-off-by: Chris Wright 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; diff --git a/queue-2.6.21/rt-mutex-fix-stale-return-value.patch b/queue-2.6.21/rt-mutex-fix-stale-return-value.patch index 771cb0e5956..e3029f2ca70 100644 --- a/queue-2.6.21/rt-mutex-fix-stale-return-value.patch +++ b/queue-2.6.21/rt-mutex-fix-stale-return-value.patch @@ -26,8 +26,8 @@ Signed-off-by: Chris Wright 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: -- 2.47.3