summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 11:40:12 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 11:40:12 -0500
commit32dbd059c44ed339de49d8d1f04203ed38dd80e0 (patch)
treeedeb503acb36ef7e32828cb766def07dfd017e8b
parent2ef9adb5a89c1dcaf8c82474e54c855d9830fbad (diff)
downloadrt-patches-32dbd059c44ed339de49d8d1f04203ed38dd80e0.tar.gz
refresh rt-core-implementation.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--rt-core-implementation.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/rt-core-implementation.patch b/rt-core-implementation.patch
index 5d13c86..99661a3 100644
--- a/rt-core-implementation.patch
+++ b/rt-core-implementation.patch
@@ -1,4 +1,4 @@
-From 242bf5f85333e15f8e1d222d1b85411d7f583c94 Mon Sep 17 00:00:00 2001
+From c651e0c06f3ea64d302837cc3b576d6993694fd2 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 3 Jul 2009 08:30:07 -0500
Subject: [PATCH] rt: core implementation
@@ -27,7 +27,7 @@ index cee2da4..3223348 100644
/*
* Are we in NMI context?
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 328bca6..45894a4 100644
+index 1221d23..3489c31 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -123,7 +123,7 @@ extern int _cond_resched(void);
@@ -36,10 +36,10 @@ index 328bca6..45894a4 100644
-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+#if defined(CONFIG_DEBUG_SPINLOCK_SLEEP) || defined(CONFIG_DEBUG_PREEMPT)
- void __might_sleep(char *file, int line, int preempt_offset);
+ void __might_sleep(const char *file, int line, int preempt_offset);
/**
* might_sleep - annotation for functions that can sleep
-@@ -286,6 +286,12 @@ extern void printk_tick(void);
+@@ -287,6 +287,12 @@ extern void printk_tick(void);
extern void asmlinkage __attribute__((format(printf, 1, 2)))
early_printk(const char *fmt, ...);
@@ -52,7 +52,7 @@ index 328bca6..45894a4 100644
unsigned long int_sqrt(unsigned long);
static inline void console_silent(void)
-@@ -315,6 +321,7 @@ extern int root_mountflags;
+@@ -316,6 +322,7 @@ extern int root_mountflags;
/* Values used for system_state */
extern enum system_states {
SYSTEM_BOOTING,
@@ -308,7 +308,7 @@ index 7c20f45..f4602f8 100644
Say N if you are unsure.
diff --git a/kernel/exit.c b/kernel/exit.c
-index c2be31f..1295e09 100644
+index 309df57..adeffd2 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -69,7 +69,9 @@ static void __unhash_process(struct task_struct *p)
@@ -321,7 +321,7 @@ index c2be31f..1295e09 100644
}
list_del_rcu(&p->thread_group);
}
-@@ -686,9 +688,11 @@ static void exit_mm(struct task_struct * tsk)
+@@ -694,9 +696,11 @@ static void exit_mm(struct task_struct * tsk)
task_lock(tsk);
tsk->mm = NULL;
up_read(&mm->mmap_sem);
@@ -333,7 +333,7 @@ index c2be31f..1295e09 100644
task_unlock(tsk);
mm_update_next_owner(mm);
mmput(mm);
-@@ -1493,6 +1497,9 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace,
+@@ -1501,6 +1505,9 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace,
struct task_struct *p)
{
int ret = eligible_child(wo, p);
@@ -344,10 +344,10 @@ index c2be31f..1295e09 100644
return ret;
diff --git a/kernel/fork.c b/kernel/fork.c
-index 5e880bd..f9cb88c 100644
+index c49f839..30086f9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -185,6 +185,16 @@ void __put_task_struct(struct task_struct *tsk)
+@@ -186,6 +186,16 @@ void __put_task_struct(struct task_struct *tsk)
free_task(tsk);
}
@@ -365,7 +365,7 @@ index 5e880bd..f9cb88c 100644
* macro override instead of weak attribute alias, to workaround
* gcc 4.1.0 and 4.1.1 bugs with weak attribute and empty functions.
diff --git a/kernel/notifier.c b/kernel/notifier.c
-index acd24e7..348a829 100644
+index 2488ba7..88d65e6 100644
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -71,7 +71,7 @@ static int notifier_chain_unregister(struct notifier_block **nl,
@@ -585,7 +585,7 @@ index dee4865..fb74031 100644
+ set_workqueue_prio(keventd_wq, SCHED_FIFO, 1, -20);
}
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 25c3ed5..4beb74a 100644
+index 5e3407d..aa0142b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -415,6 +415,8 @@ config DEBUG_RT_MUTEXES
@@ -754,7 +754,7 @@ index 619313e..65e7eab 100644
if (unexpected_testcase_failures) {
printk("-----------------------------------------------------------------\n");
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 92cdd99..bc1e61b 100644
+index 6b9670d..149f285 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -157,12 +157,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)