diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /arch/um/kernel/smp.c | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/um/kernel/smp.c')
| -rw-r--r-- | arch/um/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 106bf27e2a9a..eefb107d2d73 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
| @@ -173,7 +173,7 @@ void IPI_handler(int cpu) | |||
| 173 | break; | 173 | break; |
| 174 | 174 | ||
| 175 | case 'R': | 175 | case 'R': |
| 176 | set_tsk_need_resched(current); | 176 | scheduler_ipi(); |
| 177 | break; | 177 | break; |
| 178 | 178 | ||
| 179 | case 'S': | 179 | case 'S': |