diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-08 01:56:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-08 01:56:10 +0200 |
| commit | 866e6441a4b511d92ad7c0403424a3d37939f23f (patch) | |
| tree | 06d7c7752f7f2a3854c32d9350a6bf94b42b9bee /arch/mips/ralink/ill_acc.c | |
| parent | Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | MIPS: KVM: Do not sign extend on unsigned MMIO load (diff) | |
| download | linux-866e6441a4b511d92ad7c0403424a3d37939f23f.tar.xz linux-866e6441a4b511d92ad7c0403424a3d37939f23f.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"Eight fixes across arch/mips. Nothing stands particuarly out nor is
complicated but fixes keep coming in at a higher than comfortable
rate"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: KVM: Do not sign extend on unsigned MMIO load
MIPS: BPF: Fix stack pointer allocation
MIPS: Loongson-3: Fix a cpu-hotplug issue in loongson3_ipi_interrupt()
MIPS: Fix enabling of DEBUG_STACKOVERFLOW
MIPS: c-r4k: Fix typo in probe_scache()
MIPS: Avoid an FPE exception in FCSR mask probing
MIPS: ath79: Add a missing new line in log message
MIPS: ralink: Fix clearing the illegal access interrupt
Diffstat (limited to 'arch/mips/ralink/ill_acc.c')
| -rw-r--r-- | arch/mips/ralink/ill_acc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c index e20b02e3ae28..e10d10b9e82a 100644 --- a/arch/mips/ralink/ill_acc.c +++ b/arch/mips/ralink/ill_acc.c @@ -41,7 +41,7 @@ static irqreturn_t ill_acc_irq_handler(int irq, void *_priv) addr, (type >> ILL_ACC_OFF_S) & ILL_ACC_OFF_M, type & ILL_ACC_LEN_M); - rt_memc_w32(REG_ILL_ACC_TYPE, REG_ILL_ACC_TYPE); + rt_memc_w32(ILL_INT_STATUS, REG_ILL_ACC_TYPE); return IRQ_HANDLED; } |