Merge tag 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux

Pull h8300 updates from Yoshinori Sato:
 - Add KGDB support
 - zImage fix
 - various cleanup

* tag 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
  h8300: System call entry enable interrupt.
  h8300: show_stack cleanup
  h8300: Restraint of warning.
  h8300: Add KGDB support.
  irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw
  h8300: signal stack fix
  h8300: Add LZO compression
  h8300: zImage alignment fix
  clk: h8300: Remove "sh73a0-" part from compatible value
  h8300: zImage alignment fix

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/irqchip/irq-renesas-h8s.c b/drivers/irqchip/irq-renesas-h8s.c
index 8098ead1eb22..af8c6c61c824 100644
--- a/drivers/irqchip/irq-renesas-h8s.c
+++ b/drivers/irqchip/irq-renesas-h8s.c
@@ -40,8 +40,8 @@ static void h8s_disable_irq(struct irq_data *data)
         addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
         pos = (ipr_table[irq - 16] & 0x0f) * 4;
         pri = ~(0x000f << pos);
-        pri &= ctrl_inw(addr);
-        ctrl_outw(pri, addr);
+        pri &= readw(addr);
+        writew(pri, addr);
 }
 
 static void h8s_enable_irq(struct irq_data *data)
@@ -54,9 +54,9 @@ static void h8s_enable_irq(struct irq_data *data)
         addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
         pos = (ipr_table[irq - 16] & 0x0f) * 4;
         pri = ~(0x000f << pos);
-        pri &= ctrl_inw(addr);
+        pri &= readw(addr);
         pri |= 1 << pos;
-        ctrl_outw(pri, addr);
+        writew(pri, addr);
 }
 
 struct irq_chip h8s_irq_chip = {
@@ -90,7 +90,7 @@ static int __init h8s_intc_of_init(struct device_node *intc,
         /* All interrupt priority is 0 (disable) */
         /* IPRA to IPRK */
         for (n = 0; n <= 'k' - 'a'; n++)
-                ctrl_outw(0x0000, IPRA + (n * 2));
+                writew(0x0000, IPRA + (n * 2));
 
         domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL);
         BUG_ON(!domain);