SOURCES: kernel-desktop-preempt-rt.patch - rt4

[sparky]

Author: sparky                       Date: Thu Jun 29 15:28:21 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- rt4

---- Files affected:
SOURCES:
   kernel-desktop-preempt-rt.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.12 SOURCES/kernel-desktop-preempt-rt.patch:1.13
--- SOURCES/kernel-desktop-preempt-rt.patch:1.12	Tue Jun 27 15:03:40 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Thu Jun 29 17:28:15 2006
@@ -30379,6 +30379,19 @@
  };
  
  struct kernel_stat {
+Index: linux/include/linux/kprobes.h
+===================================================================
+--- linux.orig/include/linux/kprobes.h
++++ linux/include/linux/kprobes.h
+@@ -152,7 +152,7 @@ struct kretprobe_instance {
+ 	struct task_struct *task;
+ };
+ 
+-extern spinlock_t kretprobe_lock;
++extern raw_spinlock_t kretprobe_lock;
+ extern struct mutex kprobe_mutex;
+ extern int arch_prepare_kprobe(struct kprobe *p);
+ extern void arch_arm_kprobe(struct kprobe *p);
 Index: linux/include/linux/ktime.h
 ===================================================================
 --- linux.orig/include/linux/ktime.h
@@ -39799,6 +39812,23 @@
  			goto again;
  		}
  		tsk->signal->it_real_incr =
+Index: linux/kernel/kprobes.c
+===================================================================
+--- linux.orig/kernel/kprobes.c
++++ linux/kernel/kprobes.c
+@@ -49,7 +49,11 @@ static struct hlist_head kprobe_table[KP
+ static struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
+ 
+ DEFINE_MUTEX(kprobe_mutex);		/* Protects kprobe_table */
+-DEFINE_SPINLOCK(kretprobe_lock);	/* Protects kretprobe_inst_table */
++/*
++ * It is acquired from finish_task_switch() with preemption disbaled.
++ * Needs to be raw.
++ */
++DEFINE_RAW_SPINLOCK(kretprobe_lock);	/* Protects kretprobe_inst_table */
+ static DEFINE_PER_CPU(struct kprobe *, kprobe_instance) = NULL;
+ 
+ #ifdef __ARCH_WANT_KPROBES_INSN_SLOT
 Index: linux/kernel/latency.c
 ===================================================================
 --- /dev/null
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-preempt-rt.patch?r1=1.12&r2=1.13&f=u