Re: Real-Time Preemption, -RT-2.6.12-final-V0.7.50-37

William Weston
2005-06-30T20:07:20Z

Hi Ingo,

-50-37 wouldn't compile out of the box on my debug config.
Here's a couple minor cleanups:

--- linux-2.6.12-RT-V0.7.50-37.orig/include/linux/preempt.h 2005-06-30 12:36:37.000000000 -0700
+++ linux-2.6.12-RT-V0.7.50-37/include/linux/preempt.h 2005-06-30 12:23:38.000000000 -0700
@@ -8,6 +8,7 @@

#include <linux/config.h>
#include <linux/linkage.h>
+#include <linux/thread_info.h>

#if defined(CONFIG_DEBUG_PREEMPT) || defined(CONFIG_CRITICAL_TIMING)
extern void notrace add_preempt_count(unsigned int val);
--- linux-2.6.12-RT-V0.7.50-37.orig/kernel/rt.c 2005-06-30 12:36:37.000000000 -0700
+++ linux-2.6.12-RT-V0.7.50-37/kernel/rt.c 2005-06-30 12:30:55.000000000 -0700
@@ -450,7 +450,7 @@
#ifdef CONFIG_DEBUG_PREEMPT
if (task->lock_count) {
static int once = 1;
- if (once > 0)
+ if (once > 0) {
once--;
printk("BUG: nonzero lock count %d at exit time?\n",
task->lock_count);
@@ -925,7 +925,7 @@
static int
capture_lock(struct rt_mutex_waiter *waiter, struct task_struct *task)
{
- struct thread_info *ti = current_thread_info();
+ //struct thread_info *ti = current_thread_info();
struct rt_mutex *lock = waiter->lock;
unsigned long flags;
int ret = 0;
@@ -1411,7 +1411,7 @@
*/
static void __up_mutex(struct rt_mutex *lock, int save_state __EIP_DECL__)
{
- struct thread_info *ti = current_thread_info();
+ //struct thread_info *ti = current_thread_info();
struct task_struct *old_owner, *new_owner;
struct rt_mutex_waiter *w;
unsigned long flags;

FYI, a diff against include/linux/compile.h also made it into the the
-50-37 patch.

--ww