Merge tag 'for-3.7' of git://openrisc.net/jonas/linux

Pull OpenRISC updates from Jonas Bonn:
 "Fixups for some corner cases, build issues, and some obvious bugs in
  IRQ handling.  No major changes."

* tag 'for-3.7' of git://openrisc.net/jonas/linux:
  openrisc: mask interrupts in irq_mask_ack function
  openrisc: fix typos in comments and warnings
  openrisc: PIC should act on domain-local irqs
  openrisc: Make cpu_relax() invoke barrier()
  audit: define AUDIT_ARCH_OPENRISC
  openrisc: delay: fix handling of counter overflow
  openrisc: delay: fix loops calculation for __const_udelay

2 files changed, 12 insertions, 10 deletions

diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index e935b9d8eee1..8ec77bc9f1e7 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -46,19 +46,19 @@ EXPORT_SYMBOL(arch_local_irq_restore);
 
 static void or1k_pic_mask(struct irq_data *data)
 {
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
 }
 
 static void or1k_pic_unmask(struct irq_data *data)
 {
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->hwirq));
 }
 
 static void or1k_pic_ack(struct irq_data *data)
 {
         /* EDGE-triggered interrupts need to be ack'ed in order to clear
          * the latch.
-         * LEVER-triggered interrupts do not need to be ack'ed; however,
+         * LEVEL-triggered interrupts do not need to be ack'ed; however,
          * ack'ing the interrupt has no ill-effect and is quicker than
          * trying to figure out what type it is...
          */
@@ -75,10 +75,10 @@ static void or1k_pic_ack(struct irq_data *data)
          *     as opposed to a 1 as mandated by the spec
          */
 
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq));
+        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
 #else
-        WARN(1, "Interrupt handling possibily broken\n");
-        mtspr(SPR_PICSR, (1UL << irq));
+        WARN(1, "Interrupt handling possibly broken\n");
+        mtspr(SPR_PICSR, (1UL << data->hwirq));
 #endif
 }
 
@@ -87,10 +87,12 @@ static void or1k_pic_mask_ack(struct irq_data *data)
         /* Comments for pic_ack apply here, too */
 
 #ifdef CONFIG_OR1K_1200
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
+        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
 #else
-        WARN(1, "Interrupt handling possibily broken\n");
-        mtspr(SPR_PICSR, (1UL << irq));
+        WARN(1, "Interrupt handling possibly broken\n");
+        mtspr(SPR_PICMR, (1UL << data->hwirq));
+        mtspr(SPR_PICSR, (1UL << data->hwirq));
 #endif
 }
 
diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c
index e71781d24b0e..71a2a0c34c65 100644
--- a/arch/openrisc/kernel/ptrace.c
+++ b/arch/openrisc/kernel/ptrace.c
@@ -187,7 +187,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
                  */
                 ret = -1L;
 
-        audit_syscall_entry(audit_arch(), regs->gpr[11],
+        audit_syscall_entry(AUDIT_ARCH_OPENRISC, regs->gpr[11],
                             regs->gpr[3], regs->gpr[4],
                             regs->gpr[5], regs->gpr[6]);