[kernel] r17921 - dists/sid/linux-2.6/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Sun Aug 14 20:10:24 2011
New Revision: 17921

Log:
Update context in rt patch for 3.0.2

Modified:
   dists/sid/linux-2.6/debian/patches/features/all/rt/patch-3.0.1-rt8.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/patch-3.0.1-rt8.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/patch-3.0.1-rt8.patch	Sun Aug 14 19:31:31 2011	(r17920)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/patch-3.0.1-rt8.patch	Sun Aug 14 20:10:24 2011	(r17921)
@@ -1,3 +1,5 @@
+bwh: Update context for 3.0.2
+
 Index: linux-2.6/kernel/trace/ftrace.c
 ===================================================================
 --- linux-2.6.orig/kernel/trace/ftrace.c
@@ -17402,8 +17404,8 @@
 --- linux-2.6.orig/arch/sparc/kernel/setup_64.c
 +++ linux-2.6/arch/sparc/kernel/setup_64.c
 @@ -278,6 +278,12 @@ void __init boot_cpu_id_too_large(int cp
+ 		popc_patch();
  }
- #endif
  
 +static inline void register_prom_console(void)
 +{
@@ -21557,7 +21559,7 @@
 -	rt_waiter.task = NULL;
 +	rt_mutex_init_waiter(&rt_waiter, false);
  
- 	ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2);
+ 	ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
  	if (unlikely(ret != 0))
 @@ -2268,20 +2277,55 @@ static int futex_wait_requeue_pi(u32 __u
  	/* Queue the futex_q, drop the hb lock, wait for wakeup. */