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

[~andy/linux] / arch / s390 / kernel / head64.S

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index ae5d492b069e3c92396395dc8bf6395f4785b420..c108af28bbe890b95ec606300b1129e893071b87 100644 (file)
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/head64.S
- *
- * Copyright (C) IBM Corp. 1999,2010
+ * Copyright IBM Corp. 1999, 2010
  *
  *   Author(s):        Hartmut Penner <hp@de.ibm.com>
  *             Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -90,7 +88,7 @@ ENTRY(_stext)
 .LPG3:
 # check control registers
        stctg   %c0,%c15,0(%r15)
-       oi      6(%r15),0x40            # enable sigp emergency signal
+       oi      6(%r15),0x60            # enable sigp emergency & external call
        oi      4(%r15),0x10            # switch on low address proctection
        lctlg   %c0,%c15,0(%r15)