diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-23 14:05:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-23 14:05:43 -0400 |
| commit | b8ecad8b2f8757d51632b1ea6d602c1f7b9760a2 (patch) | |
| tree | 5a03029dbf02df606fa48a82525eb321e59b5c33 /include/linux | |
| parent | eea4a0b19a2719e3e23b5450dd9fbe97789d2a57 (diff) | |
| parent | 8bfb5e7d6a14b29cffddd113f4b0be7d9aafc1e8 (diff) | |
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')
| -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 *)); | |||
| 410 | extern void softirq_init(void); | 410 | extern void softirq_init(void); |
| 411 | static inline void __raise_softirq_irqoff(unsigned int nr) | 411 | static inline void __raise_softirq_irqoff(unsigned int nr) |
| 412 | { | 412 | { |
| 413 | trace_softirq_raise((struct softirq_action *)(unsigned long)nr, NULL); | 413 | trace_softirq_raise(nr); |
| 414 | or_softirq_pending(1UL << nr); | 414 | or_softirq_pending(1UL << nr); |
| 415 | } | 415 | } |
| 416 | 416 | ||