diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
| commit | 2faea5274f079630991800bd579f85a621f96ef5 (patch) | |
| tree | 4afb9032f0ae3a3e8b539e0abe40cda320989ac3 /arch/s390/kernel/runtime_instr.c | |
| parent | 16c5ab1d3a6d1b11ed2966fa33a3a4fecd13a2bc (diff) | |
| parent | edac894389f9c9de2a1368c78809c824b343f3a5 (diff) | |
Merge branch 'for-linus' into for-next
Merge pending fixes that haven't pulled into 3.8.
Diffstat (limited to 'arch/s390/kernel/runtime_instr.c')
| -rw-r--r-- | arch/s390/kernel/runtime_instr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c index 61066f6f71a5..077a99389b07 100644 --- a/arch/s390/kernel/runtime_instr.c +++ b/arch/s390/kernel/runtime_instr.c | |||
| @@ -71,7 +71,7 @@ static void runtime_instr_int_handler(struct ext_code ext_code, | |||
| 71 | if (!(param32 & CPU_MF_INT_RI_MASK)) | 71 | if (!(param32 & CPU_MF_INT_RI_MASK)) |
| 72 | return; | 72 | return; |
| 73 | 73 | ||
| 74 | kstat_cpu(smp_processor_id()).irqs[EXTINT_CMR]++; | 74 | inc_irq_stat(IRQEXT_CMR); |
| 75 | 75 | ||
| 76 | if (!current->thread.ri_cb) | 76 | if (!current->thread.ri_cb) |
| 77 | return; | 77 | return; |