diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /include/linux/interrupt.h | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 db43b58a3355..0053adde0ed9 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -360,7 +360,7 @@ enum | |||
| 360 | /* map softirq index to softirq name. update 'softirq_to_name' in | 360 | /* map softirq index to softirq name. update 'softirq_to_name' in |
| 361 | * kernel/softirq.c when adding a new softirq. | 361 | * kernel/softirq.c when adding a new softirq. |
| 362 | */ | 362 | */ |
| 363 | extern char *softirq_to_name[NR_SOFTIRQS]; | 363 | extern const char * const softirq_to_name[NR_SOFTIRQS]; |
| 364 | 364 | ||
| 365 | /* softirq mask and active fields moved to irq_cpustat_t in | 365 | /* softirq mask and active fields moved to irq_cpustat_t in |
| 366 | * asm/hardirq.h to get better cache usage. KAO | 366 | * asm/hardirq.h to get better cache usage. KAO |