diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-10-23 20:05:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-23 20:05:43 +0200 |
| commit | b8ecad8b2f8757d51632b1ea6d602c1f7b9760a2 (patch) | |
| tree | 5a03029dbf02df606fa48a82525eb321e59b5c33 /include/linux/interrupt.h | |
| parent | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent (diff) | |
| parent | perf tools: Remove direct slang.h include (diff) | |
| download | linux-dev-b8ecad8b2f8757d51632b1ea6d602c1f7b9760a2.tar.xz linux-dev-b8ecad8b2f8757d51632b1ea6d602c1f7b9760a2.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 414328577ced..07f741a075a7 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -410,7 +410,7 @@ extern void open_softirq(int nr, void (*action)(struct softirq_action *)); extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { - trace_softirq_raise((struct softirq_action *)(unsigned long)nr, NULL); + trace_softirq_raise(nr); or_softirq_pending(1UL << nr); } |