Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)
  [S390] prevent unneccesary loops_per_jiffy recalculation
  [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
  [S390] smp: remove cpu hotplug messages
  [S390] mutex: enable spinning mutex on s390
  [S390] mutex: Introduce arch_mutex_cpu_relax()
  [S390] cio: fix ccwgroup unregistration race condition
  [S390] perf: add DWARF register lookup for s390
  [S390] cleanup ftrace backend functions
  [S390] ptrace cleanup
  [S390] smp/idle: call init_idle() before starting a new cpu
  [S390] smp: delay idle task creation
  [S390] dasd: Correct retry counter for terminated I/O.
  [S390] dasd: Add support for raw ECKD access.
  [S390] dasd: Prevent deadlock during suspend/resume.
  [S390] dasd: Improve handling of stolen DASD reservation
  [S390] dasd: do path verification for paths added at runtime
  [S390] dasd: add High Performance FICON multitrack support
  [S390] cio: reduce memory consumption of itcw structures
  [S390] nmi: enable machine checks early
  [S390] qeth: buffer count imbalance
  ...

7 files changed, 60 insertions, 36 deletions

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 40834f18754c..dcee3c5c8954 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -2,76 +2,85 @@ comment "S/390 character device drivers"
         depends on S390
 
 config TN3270
-        tristate "Support for locally attached 3270 terminals"
+        def_tristate y
+        prompt "Support for locally attached 3270 terminals"
         depends on CCW
         help
           Include support for IBM 3270 terminals.
 
 config TN3270_TTY
-        tristate "Support for tty input/output on 3270 terminals"
+        def_tristate y
+        prompt "Support for tty input/output on 3270 terminals"
         depends on TN3270
         help
           Include support for using an IBM 3270 terminal as a Linux tty.
 
 config TN3270_FS
-        tristate "Support for fullscreen applications on 3270 terminals"
+        def_tristate m
+        prompt "Support for fullscreen applications on 3270 terminals"
         depends on TN3270
         help
           Include support for fullscreen applications on an IBM 3270 terminal.
 
 config TN3270_CONSOLE
-        bool "Support for console on 3270 terminal"
+        def_bool y
+        prompt "Support for console on 3270 terminal"
         depends on TN3270=y && TN3270_TTY=y
         help
           Include support for using an IBM 3270 terminal as a Linux system
           console.  Available only if 3270 support is compiled in statically.
 
 config TN3215
-        bool "Support for 3215 line mode terminal"
+        def_bool y
+        prompt "Support for 3215 line mode terminal"
         depends on CCW
         help
           Include support for IBM 3215 line-mode terminals.
 
 config TN3215_CONSOLE
-        bool "Support for console on 3215 line mode terminal"
+        def_bool y
+        prompt "Support for console on 3215 line mode terminal"
         depends on TN3215
         help
           Include support for using an IBM 3215 line-mode terminal as a
           Linux system console.
 
 config CCW_CONSOLE
-        bool
-        depends on TN3215_CONSOLE || TN3270_CONSOLE
-        default y
+        def_bool y if TN3215_CONSOLE || TN3270_CONSOLE
 
 config SCLP_TTY
-        bool "Support for SCLP line mode terminal"
+        def_bool y
+        prompt "Support for SCLP line mode terminal"
         depends on S390
         help
           Include support for IBM SCLP line-mode terminals.
 
 config SCLP_CONSOLE
-        bool "Support for console on SCLP line mode terminal"
+        def_bool y
+        prompt "Support for console on SCLP line mode terminal"
         depends on SCLP_TTY
         help
           Include support for using an IBM HWC line-mode terminal as the Linux
           system console.
 
 config SCLP_VT220_TTY
-        bool "Support for SCLP VT220-compatible terminal"
+        def_bool y
+        prompt "Support for SCLP VT220-compatible terminal"
         depends on S390
         help
           Include support for an IBM SCLP VT220-compatible terminal.
 
 config SCLP_VT220_CONSOLE
-        bool "Support for console on SCLP VT220-compatible terminal"
+        def_bool y
+        prompt "Support for console on SCLP VT220-compatible terminal"
         depends on SCLP_VT220_TTY
         help
           Include support for using an IBM SCLP VT220-compatible terminal as a
           Linux system console.
 
 config SCLP_CPI
-        tristate "Control-Program Identification"
+        def_tristate m
+        prompt "Control-Program Identification"
         depends on S390
         help
           This option enables the hardware console interface for system
@@ -83,7 +92,8 @@ config SCLP_CPI
           need this feature and intend to run your kernel in LPAR.
 
 config SCLP_ASYNC
-        tristate "Support for Call Home via Asynchronous SCLP Records"
+        def_tristate m
+        prompt "Support for Call Home via Asynchronous SCLP Records"
         depends on S390
         help
           This option enables the call home function, which is able to inform
@@ -93,7 +103,8 @@ config SCLP_ASYNC
           need this feature and intend to run your kernel in LPAR.
 
 config S390_TAPE
-        tristate "S/390 tape device support"
+        def_tristate m
+        prompt "S/390 tape device support"
         depends on CCW
         help
           Select this option if you want to access channel-attached tape
@@ -109,7 +120,8 @@ comment "S/390 tape interface support"
         depends on S390_TAPE
 
 config S390_TAPE_BLOCK
-        bool "Support for tape block devices"
+        def_bool y
+        prompt "Support for tape block devices"
         depends on S390_TAPE && BLOCK
         help
           Select this option if you want to access your channel-attached tape
@@ -123,7 +135,8 @@ comment "S/390 tape hardware support"
         depends on S390_TAPE
 
 config S390_TAPE_34XX
-        tristate "Support for 3480/3490 tape hardware"
+        def_tristate m
+        prompt "Support for 3480/3490 tape hardware"
         depends on S390_TAPE
         help
           Select this option if you want to access IBM 3480/3490 magnetic
@@ -131,7 +144,8 @@ config S390_TAPE_34XX
           It is safe to say "Y" here.
 
 config S390_TAPE_3590
-        tristate "Support for 3590 tape hardware"
+        def_tristate m
+        prompt "Support for 3590 tape hardware"
         depends on S390_TAPE
         help
           Select this option if you want to access IBM 3590 magnetic
@@ -139,7 +153,8 @@ config S390_TAPE_3590
           It is safe to say "Y" here.
 
 config VMLOGRDR
-        tristate "Support for the z/VM recording system services (VM only)"
+        def_tristate m
+        prompt "Support for the z/VM recording system services (VM only)"
         depends on IUCV
         help
           Select this option if you want to be able to receive records collected
@@ -148,29 +163,31 @@ config VMLOGRDR
           This driver depends on the IUCV support driver.
 
 config VMCP
-        bool "Support for the z/VM CP interface"
+        def_bool y
+        prompt "Support for the z/VM CP interface"
         depends on S390
         help
           Select this option if you want to be able to interact with the control
           program on z/VM
 
 config MONREADER
-        tristate "API for reading z/VM monitor service records"
+        def_tristate m
+        prompt "API for reading z/VM monitor service records"
         depends on IUCV
         help
           Character device driver for reading z/VM monitor service records
 
 config MONWRITER
-        tristate "API for writing z/VM monitor service records"
+        def_tristate m
+        prompt "API for writing z/VM monitor service records"
         depends on S390
-        default "m"
         help
           Character device driver for writing z/VM monitor service records
 
 config S390_VMUR
-        tristate "z/VM unit record device driver"
+        def_tristate m
+        prompt "z/VM unit record device driver"
         depends on S390
-        default "m"
         help
           Character device driver for z/VM reader, puncher and printer.
 
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 59ec073724bf..3fb4335d491d 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -9,6 +9,7 @@
  *            Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
@@ -361,6 +362,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
         int cstat, dstat;
         int count;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_C15]++;
         raw = dev_get_drvdata(&cdev->dev);
         req = (struct raw3215_req *) intparm;
         cstat = irb->scsw.cmd.cstat;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 2a4c566456e7..96ba2fd1c8ad 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -7,6 +7,7 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct raw3270_request *rq;
         int rc;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
         rp = dev_get_drvdata(&cdev->dev);
         if (!rp)
                 return;
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 35cc4686b99b..b76c61f82485 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -7,6 +7,7 @@
  *            Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/spinlock.h>
@@ -18,16 +19,14 @@
 #include <linux/suspend.h>
 #include <linux/completion.h>
 #include <linux/platform_device.h>
-#include <asm/types.h>
 #include <asm/s390_ext.h>
+#include <asm/types.h>
+#include <asm/irq.h>
 
 #include "sclp.h"
 
 #define SCLP_HEADER             "sclp: "
 
-/* Structure for register_early_external_interrupt. */
-static ext_int_info_t ext_int_info_hwc;
-
 /* Lock to protect internal data consistency. */
 static DEFINE_SPINLOCK(sclp_lock);
 
@@ -402,6 +401,7 @@ static void sclp_interrupt_handler(unsigned int ext_int_code,
         u32 finished_sccb;
         u32 evbuf_pending;
 
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
         spin_lock(&sclp_lock);
         finished_sccb = param32 & 0xfffffff8;
         evbuf_pending = param32 & 0x3;
@@ -824,6 +824,7 @@ static void sclp_check_handler(unsigned int ext_int_code,
 {
         u32 finished_sccb;
 
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
         finished_sccb = param32 & 0xfffffff8;
         /* Is this the interrupt we are waiting for? */
         if (finished_sccb == 0)
@@ -866,8 +867,7 @@ sclp_check_interface(void)
 
         spin_lock_irqsave(&sclp_lock, flags);
         /* Prepare init mask command */
-        rc = register_early_external_interrupt(0x2401, sclp_check_handler,
-                                               &ext_int_info_hwc);
+        rc = register_external_interrupt(0x2401, sclp_check_handler);
         if (rc) {
                 spin_unlock_irqrestore(&sclp_lock, flags);
                 return rc;
@@ -900,8 +900,7 @@ sclp_check_interface(void)
                 } else
                         rc = -EBUSY;
         }
-        unregister_early_external_interrupt(0x2401, sclp_check_handler,
-                                            &ext_int_info_hwc);
+        unregister_external_interrupt(0x2401, sclp_check_handler);
         spin_unlock_irqrestore(&sclp_lock, flags);
         return rc;
 }
@@ -1064,8 +1063,7 @@ sclp_init(void)
         if (rc)
                 goto fail_init_state_uninitialized;
         /* Register interrupt handler */
-        rc = register_early_external_interrupt(0x2401, sclp_interrupt_handler,
-                                               &ext_int_info_hwc);
+        rc = register_external_interrupt(0x2401, sclp_interrupt_handler);
         if (rc)
                 goto fail_unregister_reboot_notifier;
         sclp_init_state = sclp_init_state_initialized;
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index b497afe061cc..16e232a99fb7 100644
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -33,6 +33,7 @@ static void sclp_cpu_capability_notify(struct work_struct *work)
         int cpu;
         struct sys_device *sysdev;
 
+        s390_adjust_jiffies();
         pr_warning("cpu capability changed.\n");
         get_online_cpus();
         for_each_online_cpu(cpu) {
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index b3a3e8e8656e..7978a0adeaf3 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -14,6 +14,7 @@
 #define KMSG_COMPONENT "tape"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/init.h>      // for kernel parameters
 #include <linux/kmod.h>      // for requesting modules
@@ -1114,6 +1115,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct tape_request *request;
         int rc;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_TAP]++;
         device = dev_get_drvdata(&cdev->dev);
         if (device == NULL) {
                 return;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index f7e4ae6bf15a..caef1757341d 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -11,6 +11,7 @@
 #define KMSG_COMPONENT "vmur"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/cdev.h>
 #include <linux/slab.h>
 
@@ -302,6 +303,7 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
 {
         struct urdev *urd;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_VMR]++;
         TRACE("ur_int_handler: intparm=0x%lx cstat=%02x dstat=%02x res=%u\n",
               intparm, irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
               irb->scsw.cmd.count);