Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull second set of s390 patches from Martin Schwidefsky:
 "The second part of Heikos uaccess rework, the page table walker for
  uaccess is now a thing of the past (yay!)

  The code change to fix the theoretical TLB flush problem allows us to
  add a TLB flush optimization for zEC12, this machine has new
  instructions that allow to do CPU local TLB flushes for single pages
  and for all pages of a specific address space.

  Plus the usual bug fixing and some more cleanup"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uaccess: rework uaccess code - fix locking issues
  s390/mm,tlb: optimize TLB flushing for zEC12
  s390/mm,tlb: safeguard against speculative TLB creation
  s390/irq: Use defines for external interruption codes
  s390/irq: Add defines for external interruption codes
  s390/sclp: add timeout for queued requests
  kvm/s390: also set guest pages back to stable on kexec/kdump
  lcs: Add missing destroy_timer_on_stack()
  s390/tape: Add missing destroy_timer_on_stack()
  s390/tape: Use del_timer_sync()
  s390/3270: fix crash with multiple reset device requests
  s390/bitops,atomic: add missing memory barriers
  s390/zcrypt: add length check for aligned data to avoid overflow in msg-type 6

1 files changed, 3 insertions, 3 deletions

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 79a0ce95799f..da787930df0a 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -2028,7 +2028,7 @@ static int __init iucv_init(void)
         rc = iucv_query_maxconn();
         if (rc)
                 goto out_ctl;
-        rc = register_external_interrupt(0x4000, iucv_external_interrupt);
+        rc = register_external_irq(EXT_IRQ_IUCV, iucv_external_interrupt);
         if (rc)
                 goto out_ctl;
         iucv_root = root_device_register("iucv");
@@ -2078,7 +2078,7 @@ out_free:
 
         root_device_unregister(iucv_root);
 out_int:
-        unregister_external_interrupt(0x4000, iucv_external_interrupt);
+        unregister_external_irq(EXT_IRQ_IUCV, iucv_external_interrupt);
 out_ctl:
         ctl_clear_bit(0, 1);
 out:
@@ -2109,7 +2109,7 @@ static void __exit iucv_exit(void)
         cpu_notifier_register_done();
         root_device_unregister(iucv_root);
         bus_unregister(&iucv_bus);
-        unregister_external_interrupt(0x4000, iucv_external_interrupt);
+        unregister_external_irq(EXT_IRQ_IUCV, iucv_external_interrupt);
 }
 
 subsys_initcall(iucv_init);