176 files changed, 571 insertions, 1044 deletions
diff --git a/arch/s390/appldata/appldata.h b/arch/s390/appldata/appldata.h
index f0b23fc759ba..4a67f2b5f6aa 100644
--- a/arch/s390/appldata/appldata.h
+++ b/arch/s390/appldata/appldata.h
@@ -1,6 +1,4 @@
 /*
- * arch/s390/appldata/appldata.h
- *
 * Definitions and interface for Linux - z/VM Monitor Stream.
 *
 * Copyright IBM Corp. 2003, 2008
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 24bff4f1cc52..bae0f402bf2a 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -1,6 +1,4 @@
 /*
- * arch/s390/appldata/appldata_base.c
- *
 * Base infrastructure for Linux-z/VM Monitor Stream, Stage 1.
 * Exports appldata_register_ops() and appldata_unregister_ops() for the
 * data gathering modules.
@@ -29,7 +27,7 @@
 #include <linux/suspend.h>
 #include <linux/platform_device.h>
 #include <asm/appldata.h>
-#include <asm/timer.h>
+#include <asm/vtimer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/smp.h>
@@ -84,8 +82,7 @@ static struct ctl_table appldata_dir_table[] = {
 /*
 * Timer
 */
-static DEFINE_PER_CPU(struct vtimer_list, appldata_timer);
+static struct vtimer_list appldata_timer;
-static atomic_t appldata_expire_count = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(appldata_timer_lock);
 static int appldata_interval = APPLDATA_CPU_INTERVAL;
@@ -115,10 +112,7 @@ static LIST_HEAD(appldata_ops_list);
 */
 static void appldata_timer_function(unsigned long data)
 {
-        if (atomic_dec_and_test(&appldata_expire_count)) {
+        queue_work(appldata_wq, (struct work_struct *) data);
-                atomic_set(&appldata_expire_count, num_online_cpus());
-                queue_work(appldata_wq, (struct work_struct *) data);
-        }
 }
 /*
@@ -131,7 +125,6 @@ static void appldata_work_fn(struct work_struct *work)
        struct list_head *lh;
        struct appldata_ops *ops;
-        get_online_cpus();
        mutex_lock(&appldata_ops_mutex);
        list_for_each(lh, &appldata_ops_list) {
                ops = list_entry(lh, struct appldata_ops, list);
@@ -140,7 +133,6 @@ static void appldata_work_fn(struct work_struct *work)
                }
        }
        mutex_unlock(&appldata_ops_mutex);
-        put_online_cpus();
 }
 /*
@@ -168,20 +160,6 @@ int appldata_diag(char record_nr, u16 function, unsigned long buffer,
 /****************************** /proc stuff **********************************/
-/*
- * appldata_mod_vtimer_wrap()
- *
- * wrapper function for mod_virt_timer(), because smp_call_function_single()
- * accepts only one parameter.
- */
-static void __appldata_mod_vtimer_wrap(void *p) {
-        struct {
-                struct vtimer_list *timer;
-                u64    expires;
-        } *args = p;
-        mod_virt_timer_periodic(args->timer, args->expires);
-}
 #define APPLDATA_ADD_TIMER      0
 #define APPLDATA_DEL_TIMER      1
 #define APPLDATA_MOD_TIMER      2
@@ -192,49 +170,28 @@ static void __appldata_mod_vtimer_wrap(void *p) {
 * Add, delete or modify virtual timers on all online cpus.
 * The caller needs to get the appldata_timer_lock spinlock.
 */
-static void
+static void __appldata_vtimer_setup(int cmd)
-__appldata_vtimer_setup(int cmd)
 {
-        u64 per_cpu_interval;
+        u64 timer_interval = (u64) appldata_interval * 1000 * TOD_MICRO;
-        int i;
        switch (cmd) {
        case APPLDATA_ADD_TIMER:
                if (appldata_timer_active)
                        break;
-                per_cpu_interval = (u64) (appldata_interval*1000 /
+                appldata_timer.expires = timer_interval;
-                                          num_online_cpus()) * TOD_MICRO;
+                add_virt_timer_periodic(&appldata_timer);
-                for_each_online_cpu(i) {
-                        per_cpu(appldata_timer, i).expires = per_cpu_interval;
-                        smp_call_function_single(i, add_virt_timer_periodic,
-                                                 &per_cpu(appldata_timer, i),
-                                                 1);
-                }
                appldata_timer_active = 1;
                break;
        case APPLDATA_DEL_TIMER:
-                for_each_online_cpu(i)
+                del_virt_timer(&appldata_timer);
-                        del_virt_timer(&per_cpu(appldata_timer, i));
                if (!appldata_timer_active)
                        break;
                appldata_timer_active = 0;
-                atomic_set(&appldata_expire_count, num_online_cpus());
                break;
        case APPLDATA_MOD_TIMER:
-                per_cpu_interval = (u64) (appldata_interval*1000 /
-                                          num_online_cpus()) * TOD_MICRO;
                if (!appldata_timer_active)
                        break;
-                for_each_online_cpu(i) {
+                mod_virt_timer_periodic(&appldata_timer, timer_interval);
-                        struct {
-                                struct vtimer_list *timer;
-                                u64    expires;
-                        } args;
-                        args.timer = &per_cpu(appldata_timer, i);
-                        args.expires = per_cpu_interval;
-                        smp_call_function_single(i, __appldata_mod_vtimer_wrap,
-                                                 &args, 1);
-                }
        }
 }
@@ -265,14 +222,12 @@ appldata_timer_handler(ctl_table *ctl, int write,
        len = *lenp;
        if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len))
                return -EFAULT;
-        get_online_cpus();
        spin_lock(&appldata_timer_lock);
        if (buf[0] == '1')
                __appldata_vtimer_setup(APPLDATA_ADD_TIMER);
        else if (buf[0] == '0')
                __appldata_vtimer_setup(APPLDATA_DEL_TIMER);
        spin_unlock(&appldata_timer_lock);
-        put_online_cpus();
 out:
        *lenp = len;
        *ppos += len;
@@ -305,20 +260,17 @@ appldata_interval_handler(ctl_table *ctl, int write,
                goto out;
        }
        len = *lenp;
-        if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) {
+        if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len))
                return -EFAULT;
-        }
        interval = 0;
        sscanf(buf, "%i", &interval);
        if (interval <= 0)
                return -EINVAL;
-        get_online_cpus();
        spin_lock(&appldata_timer_lock);
        appldata_interval = interval;
        __appldata_vtimer_setup(APPLDATA_MOD_TIMER);
        spin_unlock(&appldata_timer_lock);
-        put_online_cpus();
 out:
        *lenp = len;
        *ppos += len;
@@ -485,14 +437,12 @@ static int appldata_freeze(struct device *dev)
        int rc;
        struct list_head *lh;
-        get_online_cpus();
        spin_lock(&appldata_timer_lock);
        if (appldata_timer_active) {
                __appldata_vtimer_setup(APPLDATA_DEL_TIMER);
                appldata_timer_suspended = 1;
        }
        spin_unlock(&appldata_timer_lock);
-        put_online_cpus();
        mutex_lock(&appldata_ops_mutex);
        list_for_each(lh, &appldata_ops_list) {
@@ -516,14 +466,12 @@ static int appldata_restore(struct device *dev)
        int rc;
        struct list_head *lh;
-        get_online_cpus();
        spin_lock(&appldata_timer_lock);
        if (appldata_timer_suspended) {
                __appldata_vtimer_setup(APPLDATA_ADD_TIMER);
                appldata_timer_suspended = 0;
        }
        spin_unlock(&appldata_timer_lock);
-        put_online_cpus();
        mutex_lock(&appldata_ops_mutex);
        list_for_each(lh, &appldata_ops_list) {
@@ -567,53 +515,6 @@ static struct platform_driver appldata_pdrv = {
 /******************************* init / exit *********************************/
-static void __cpuinit appldata_online_cpu(int cpu)
-{
-        init_virt_timer(&per_cpu(appldata_timer, cpu));
-        per_cpu(appldata_timer, cpu).function = appldata_timer_function;
-        per_cpu(appldata_timer, cpu).data = (unsigned long)
-                &appldata_work;
-        atomic_inc(&appldata_expire_count);
-        spin_lock(&appldata_timer_lock);
-        __appldata_vtimer_setup(APPLDATA_MOD_TIMER);
-        spin_unlock(&appldata_timer_lock);
-}
-static void __cpuinit appldata_offline_cpu(int cpu)
-{
-        del_virt_timer(&per_cpu(appldata_timer, cpu));
-        if (atomic_dec_and_test(&appldata_expire_count)) {
-                atomic_set(&appldata_expire_count, num_online_cpus());
-                queue_work(appldata_wq, &appldata_work);
-        }
-        spin_lock(&appldata_timer_lock);
-        __appldata_vtimer_setup(APPLDATA_MOD_TIMER);
-        spin_unlock(&appldata_timer_lock);
-}
-static int __cpuinit appldata_cpu_notify(struct notifier_block *self,
-                                         unsigned long action,
-                                         void *hcpu)
-{
-        switch (action) {
-        case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
-                appldata_online_cpu((long) hcpu);
-                break;
-        case CPU_DEAD:
-        case CPU_DEAD_FROZEN:
-                appldata_offline_cpu((long) hcpu);
-                break;
-        default:
-                break;
-        }
-        return NOTIFY_OK;
-}
-static struct notifier_block __cpuinitdata appldata_nb = {
-        .notifier_call = appldata_cpu_notify,
-};
 /*
 * appldata_init()
 *
@@ -621,7 +522,10 @@ static struct notifier_block __cpuinitdata appldata_nb = {
 */
 static int __init appldata_init(void)
 {
-        int i, rc;
+        int rc;
+        appldata_timer.function = appldata_timer_function;
+        appldata_timer.data = (unsigned long) &appldata_work;
        rc = platform_driver_register(&appldata_pdrv);
        if (rc)
@@ -639,14 +543,6 @@ static int __init appldata_init(void)
                goto out_device;
        }
-        get_online_cpus();
-        for_each_online_cpu(i)
-                appldata_online_cpu(i);
-        put_online_cpus();
-        /* Register cpu hotplug notifier */
-        register_hotcpu_notifier(&appldata_nb);
        appldata_sysctl_header = register_sysctl_table(appldata_dir_table);
        return 0;
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index f7d3dc555bdb..02d9a1cf5057 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -1,10 +1,8 @@
 /*
- * arch/s390/appldata/appldata_mem.c
- *
 * Data gathering module for Linux-VM Monitor Stream, Stage 1.
 * Collects data related to memory management.
 *
- * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright IBM Corp. 2003, 2006
 *
 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
 */
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 5da7c562a90b..1370e358d49a 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -1,11 +1,9 @@
 /*
- * arch/s390/appldata/appldata_net_sum.c
- *
 * Data gathering module for Linux-VM Monitor Stream, Stage 1.
 * Collects accumulated network statistics (Packets received/transmitted,
 * dropped, errors, ...).
 *
- * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright IBM Corp. 2003, 2006
 *
 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
 */
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index 4de031d6b76c..87521ba682e5 100644
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -1,10 +1,8 @@
 /*
- * arch/s390/appldata/appldata_os.c
- *
 * Data gathering module for Linux-VM Monitor Stream, Stage 1.
 * Collects misc. OS related data (CPU utilization, running processes).
 *
- * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright IBM Corp. 2003, 2006
 *
 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
 */
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index a9ce135893f8..e402a9dd4eda 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -4,7 +4,7 @@
 * s390 implementation of the AES Cipher Algorithm.
 *
 * s390 Version:
- *   Copyright IBM Corp. 2005,2007
+ *   Copyright IBM Corp. 2005, 2007
 *   Author(s): Jan Glauber (jang@de.ibm.com)
 *              Sebastian Siewior (sebastian@breakpoint.cc> SW-Fallback
 *
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 9178db6db0a5..6c5cc6da7111 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -3,7 +3,7 @@
 *
 * Support for s390 cryptographic instructions.
 *
- *   Copyright IBM Corp. 2003,2007
+ *   Copyright IBM Corp. 2003, 2007
 *   Author(s): Thomas Spatzier
 *              Jan Glauber (jan.glauber@de.ibm.com)
 *
diff --git a/arch/s390/crypto/crypto_des.h b/arch/s390/crypto/crypto_des.h
deleted file mode 100644
index 6210457ceebb..000000000000
--- a/arch/s390/crypto/crypto_des.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Function for checking keys for the DES and Tripple DES Encryption
- * algorithms.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- */
-#ifndef __CRYPTO_DES_H__
-#define __CRYPTO_DES_H__
-extern int crypto_des_check_key(const u8*, unsigned int, u32*);
-#endif /*__CRYPTO_DES_H__*/
diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index a52bfd124d86..1eaa371ca3ee 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -3,7 +3,7 @@
 *
 * s390 implementation of the DES Cipher Algorithm.
 *
- * Copyright IBM Corp. 2003,2011
+ * Copyright IBM Corp. 2003, 2011
 * Author(s): Thomas Spatzier
 *            Jan Glauber (jan.glauber@de.ibm.com)
 *
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 0808fbf0f7d3..94a35a4c1b48 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2006,2007
+ * Copyright IBM Corp. 2006, 2007
 * Author(s): Jan Glauber <jan.glauber@de.ibm.com>
 * Driver for the s390 pseudo random number generator
 */
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index e9868c6e0a08..a1b3a9dc9d8a 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -8,7 +8,7 @@
 * implementation written by Steve Reid.
 *
 * s390 Version:
- *   Copyright IBM Corp. 2003,2007
+ *   Copyright IBM Corp. 2003, 2007
 *   Author(s): Thomas Spatzier
 *              Jan Glauber (jan.glauber@de.ibm.com)
 *
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 0317a3547cb9..9b853809a492 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -4,7 +4,7 @@
 * s390 implementation of the SHA256 and SHA224 Secure Hash Algorithm.
 *
 * s390 Version:
- *   Copyright IBM Corp. 2005,2011
+ *   Copyright IBM Corp. 2005, 2011
 *   Author(s): Jan Glauber (jang@de.ibm.com)
 *
 * This program is free software; you can redistribute it and/or modify it
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index d9df5a060a83..f41e0ef7fdf9 100644
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/hypfs/hypfs.h
 *    Hypervisor filesystem for Linux on s390.
 *
- *    Copyright (C) IBM Corp. 2006
+ *    Copyright IBM Corp. 2006
 *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
 */
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index b478013b7fec..13e76dabbe8b 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -1,7 +1,7 @@
 /*
 * Hypervisor filesystem for Linux on s390 - debugfs interface
 *
- * Copyright (C) IBM Corp. 2010
+ * Copyright IBM Corp. 2010
 * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
 */
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 74c8f5e76ce4..7fd3690b6760 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -1,5 +1,4 @@
 /*
- *  arch/s390/hypfs/hypfs_diag.c
 *    Hypervisor filesystem for Linux on s390. Diag 204 and 224
 *    implementation.
 *
diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index e54796002f61..4f6afaa8bd8f 100644
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -1,7 +1,7 @@
 /*
 *    Hypervisor filesystem for Linux on s390. z/VM implementation.
 *
- *    Copyright (C) IBM Corp. 2006
+ *    Copyright IBM Corp. 2006
 *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
 */
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 73dae8b9b77a..6767b437a103 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -1,5 +1,4 @@
 /*
- *  arch/s390/hypfs/inode.c
 *    Hypervisor filesystem for Linux on s390.
 *
 *    Copyright IBM Corp. 2006, 2008
@@ -103,6 +102,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode)
        if (ret) {
                struct hypfs_sb_info *hypfs_info = sb->s_fs_info;
+                ret->i_ino = get_next_ino();
                ret->i_mode = mode;
                ret->i_uid = hypfs_info->uid;
                ret->i_gid = hypfs_info->gid;
diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h
index 1ac80d6b0588..9819891ed7a2 100644
--- a/arch/s390/include/asm/airq.h
+++ b/arch/s390/include/asm/airq.h
@@ -1,7 +1,5 @@
 /*
- *  include/asm-s390/airq.h
+ *    Copyright IBM Corp. 2002, 2007
- *
- *    Copyright IBM Corp. 2002,2007
 *    Author(s): Ingo Adlung <adlung@de.ibm.com>
 *               Cornelia Huck <cornelia.huck@de.ibm.com>
 *               Arnd Bergmann <arndb@de.ibm.com>
diff --git a/arch/s390/include/asm/appldata.h b/arch/s390/include/asm/appldata.h
index 79283dac8281..f328294faeae 100644
--- a/arch/s390/include/asm/appldata.h
+++ b/arch/s390/include/asm/appldata.h
@@ -1,7 +1,5 @@
 /*
- * include/asm-s390/appldata.h
+ * Copyright IBM Corp. 2006
- *
- * Copyright (C) IBM Corp. 2006
 *
 * Author(s): Melissa Howland <melissah@us.ibm.com>
 */
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
index 748347baecb8..c797832daa5f 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
@@ -1,8 +1,5 @@
-#ifndef __ARCH_S390_ATOMIC__
-#define __ARCH_S390_ATOMIC__
 /*
- * Copyright 1999,2009 IBM Corp.
+ * Copyright IBM Corp. 1999, 2009
 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *            Denis Joseph Barrow,
 *            Arnd Bergmann <arndb@de.ibm.com>,
@@ -13,6 +10,9 @@
 *
 */
+#ifndef __ARCH_S390_ATOMIC__
+#define __ARCH_S390_ATOMIC__
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <asm/cmpxchg.h>
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index a6ff5a83e227..6f573890fb28 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -1,11 +1,6 @@
-#ifndef _S390_BITOPS_H
-#define _S390_BITOPS_H
 /*
- *  include/asm-s390/bitops.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/bitops.h"
@@ -13,6 +8,9 @@
 *
 */
+#ifndef _S390_BITOPS_H
+#define _S390_BITOPS_H
 #ifndef _LINUX_BITOPS_H
 #error only <linux/bitops.h> can be included directly
 #endif
diff --git a/arch/s390/include/asm/bugs.h b/arch/s390/include/asm/bugs.h
index 011f1e6a2a6c..0f5bd894f4dc 100644
--- a/arch/s390/include/asm/bugs.h
+++ b/arch/s390/include/asm/bugs.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/bugs.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/bugs.h"
diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
index 2a30d5ac0667..4d7ccac5fd1d 100644
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/cache.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *
 *  Derived from "include/asm-i386/cache.h"
 *    Copyright (C) 1992, Linus Torvalds
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index 9381c92cc779..1cb4bb3f32d9 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright  IBM Corp. 2002, 2009
+ * Copyright IBM Corp. 2002, 2009
 *
 * Author(s): Arnd Bergmann <arndb@de.ibm.com>
 *
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index f2ef34f6d6e5..01a905eb11e0 100644
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -6,14 +6,12 @@ struct ccw_driver;
 /**
 * struct ccwgroup_device - ccw group device
- * @creator_id: unique number of the driver
 * @state: online/offline state
 * @count: number of attached slave devices
 * @dev: embedded device structure
 * @cdev: variable number of slave devices, allocated as needed
 */
 struct ccwgroup_device {
-        unsigned long creator_id;
        enum {
                CCWGROUP_OFFLINE,
                CCWGROUP_ONLINE,
diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h
index 6c00f6800a34..4f57a4f3909a 100644
--- a/arch/s390/include/asm/checksum.h
+++ b/arch/s390/include/asm/checksum.h
@@ -1,18 +1,16 @@
-#ifndef _S390_CHECKSUM_H
-#define _S390_CHECKSUM_H
 /*
- *  include/asm-s390/checksum.h
 *    S390 fast network checksum routines
- *    see also arch/S390/lib/checksum.c
 *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Ulrich Hild        (first version)
 *               Martin Schwidefsky (heavily optimized CKSM version)
 *               D.J. Barrow        (third attempt) 
 */
+#ifndef _S390_CHECKSUM_H
+#define _S390_CHECKSUM_H
 #include <asm/uaccess.h>
 /*
diff --git a/arch/s390/include/asm/chpid.h b/arch/s390/include/asm/chpid.h
index 8e88e2221771..e5bde9f9291f 100644
--- a/arch/s390/include/asm/chpid.h
+++ b/arch/s390/include/asm/chpid.h
@@ -1,6 +1,4 @@
 /*
- *  drivers/s390/cio/chpid.h
- *
 *    Copyright IBM Corp. 2007
 *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/chsc.h b/arch/s390/include/asm/chsc.h
index 4943654ed7fd..bf115b49f444 100644
--- a/arch/s390/include/asm/chsc.h
+++ b/arch/s390/include/asm/chsc.h
@@ -1,7 +1,7 @@
 /*
 * ioctl interface for /dev/chsc
 *
- * Copyright 2008 IBM Corp.
+ * Copyright IBM Corp. 2008
 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index 4c8d4d5b8bd2..77043aa44d67 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -1,7 +1,4 @@
 /*
- *  include/asm-s390/cio.h
- *  include/asm-s390x/cio.h
- *
 * Common interface for I/O on S/390
 */
 #ifndef _ASM_S390_CIO_H_
diff --git a/arch/s390/include/asm/cpcmd.h b/arch/s390/include/asm/cpcmd.h
index 48a9eab16429..3dfadb5d648f 100644
--- a/arch/s390/include/asm/cpcmd.h
+++ b/arch/s390/include/asm/cpcmd.h
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/kernel/cpcmd.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Christian Borntraeger (cborntra@de.ibm.com),
 */
diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h
index e0b69540216f..f5a8e2fcde0c 100644
--- a/arch/s390/include/asm/cpu.h
+++ b/arch/s390/include/asm/cpu.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2000,2009
+ *    Copyright IBM Corp. 2000, 2009
 *    Author(s): Hartmut Penner <hp@de.ibm.com>,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Christian Ehrhardt <ehrhardt@de.ibm.com>,
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index 718374de9c7f..8709bdef233c 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -1,7 +1,5 @@
 /*
- *  include/asm-s390/cputime.h
+ *  Copyright IBM Corp. 2004
- *
- *  (C) Copyright IBM Corp. 2004
 *
 *  Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
 */
@@ -167,12 +165,14 @@ static inline clock_t cputime64_to_clock_t(cputime64_t cputime)
 }
 struct s390_idle_data {
+        int nohz_delay;
        unsigned int sequence;
        unsigned long long idle_count;
-        unsigned long long idle_enter;
-        unsigned long long idle_exit;
        unsigned long long idle_time;
-        int nohz_delay;
+        unsigned long long clock_idle_enter;
+        unsigned long long clock_idle_exit;
+        unsigned long long timer_idle_enter;
+        unsigned long long timer_idle_exit;
 };
 DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
diff --git a/arch/s390/include/asm/crw.h b/arch/s390/include/asm/crw.h
index 749a97e61bea..7c31d3e25cd1 100644
--- a/arch/s390/include/asm/crw.h
+++ b/arch/s390/include/asm/crw.h
@@ -1,6 +1,6 @@
 /*
 *   Data definitions for channel report processing
- *    Copyright IBM Corp. 2000,2009
+ *    Copyright IBM Corp. 2000, 2009
 *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Cornelia Huck <cornelia.huck@de.ibm.com>,
diff --git a/arch/s390/include/asm/current.h b/arch/s390/include/asm/current.h
index 7a68084ec2f0..b80941f30df5 100644
--- a/arch/s390/include/asm/current.h
+++ b/arch/s390/include/asm/current.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/current.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/current.h"
diff --git a/arch/s390/include/asm/dasd.h b/arch/s390/include/asm/dasd.h
index 0be28efe5b66..38eca3ba40e2 100644
--- a/arch/s390/include/asm/dasd.h
+++ b/arch/s390/include/asm/dasd.h
@@ -1,8 +1,7 @@
 /* 
- * File...........: linux/drivers/s390/block/dasd.c
 * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
 * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
+ * Copyright IBM Corp. 1999, 2000
 * EMC Symmetrix ioctl Copyright EMC Corporation, 2008
 * Author.........: Nigel Hislop <hislop_nigel@emc.com>
 *
diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h
index 8a8245ed14d2..f39677e6ccde 100644
--- a/arch/s390/include/asm/debug.h
+++ b/arch/s390/include/asm/debug.h
@@ -1,9 +1,7 @@
 /*
- *  include/asm-s390/debug.h
 *   S/390 debug facility
 *
- *    Copyright (C) 1999, 2000 IBM Deutschland Entwicklung GmbH,
+ *    Copyright IBM Corp. 1999, 2000
- *                             IBM Corporation
 */
 #ifndef DEBUG_H
diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h
index 0e3b35f96be1..3f6e4095f471 100644
--- a/arch/s390/include/asm/delay.h
+++ b/arch/s390/include/asm/delay.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/delay.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/delay.h"
diff --git a/arch/s390/include/asm/dma.h b/arch/s390/include/asm/dma.h
index 7425c6af6cd4..6fb6de4f15b0 100644
--- a/arch/s390/include/asm/dma.h
+++ b/arch/s390/include/asm/dma.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/dma.h
- *
 *  S390 version
 */
diff --git a/arch/s390/include/asm/ebcdic.h b/arch/s390/include/asm/ebcdic.h
index 7f6f641d32f4..c5befc5a3bf5 100644
--- a/arch/s390/include/asm/ebcdic.h
+++ b/arch/s390/include/asm/ebcdic.h
@@ -1,9 +1,8 @@
 /*
- *  include/asm-s390/ebcdic.h
 *    EBCDIC -> ASCII, ASCII -> EBCDIC conversion routines.
 *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 06151e6a3098..32e8449640fa 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/elf.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/elf.h"
diff --git a/arch/s390/include/asm/errno.h b/arch/s390/include/asm/errno.h
index e41d5b37c4d6..395e97d8005e 100644
--- a/arch/s390/include/asm/errno.h
+++ b/arch/s390/include/asm/errno.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/errno.h
- *
 *  S390 version
 *
 */
diff --git a/arch/s390/include/asm/etr.h b/arch/s390/include/asm/etr.h
index 538e1b36a726..a24b03b9fb64 100644
--- a/arch/s390/include/asm/etr.h
+++ b/arch/s390/include/asm/etr.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/etr.h
- *
 *  Copyright IBM Corp. 2006
 *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/include/asm/extmem.h b/arch/s390/include/asm/extmem.h
index 33837d756184..6276002d76ba 100644
--- a/arch/s390/include/asm/extmem.h
+++ b/arch/s390/include/asm/extmem.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390x/extmem.h
- *
 *  definitions for external memory segment support
- *  Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *  Copyright IBM Corp. 2003
 */
 #ifndef _ASM_S390X_DCSS_H
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index 510ba9ef4248..0c82ba86e997 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/hardirq.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
 *
diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h
index aef0dde340d1..ea5a6e45fd93 100644
--- a/arch/s390/include/asm/idals.h
+++ b/arch/s390/include/asm/idals.h
@@ -1,10 +1,9 @@
 /* 
- * File...........: linux/include/asm-s390x/idals.h
 * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
 *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
 * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000a
+ * Copyright IBM Corp. 2000
- 
+ *
 * History of changes
 * 07/24/00 new file
 * 05/04/02 code restructuring.
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
index f81a0975cbea..559e921a6bba 100644
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/io.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/io.h"
diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h
index 38fdf451febb..37b9091ab8c0 100644
--- a/arch/s390/include/asm/irqflags.h
+++ b/arch/s390/include/asm/irqflags.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2006,2010
+ *    Copyright IBM Corp. 2006, 2010
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h
index f4f38826eebb..694bcd6bd927 100644
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
@@ -1,7 +1,5 @@
 /*
- * include/asm-s390/kexec.h
+ * Copyright IBM Corp. 2005
- *
- * (C) Copyright IBM Corp. 2005
 *
 * Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
 *
diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
index a231a9439c4b..dcf6948a875c 100644
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
@@ -17,7 +17,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * Copyright (C) IBM Corporation, 2002, 2006
+ * Copyright IBM Corp. 2002, 2006
 *
 * 2002-Oct     Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
 *              Probes initial implementation ( includes suggestions from
diff --git a/arch/s390/include/asm/kvm.h b/arch/s390/include/asm/kvm.h
index bdcbe0f8dd7b..d25da598ec62 100644
--- a/arch/s390/include/asm/kvm.h
+++ b/arch/s390/include/asm/kvm.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_KVM_S390_H
 #define __LINUX_KVM_S390_H
 /*
- * asm-s390/kvm.h - KVM s390 specific structures and definitions
+ * KVM s390 specific structures and definitions
 *
 * Copyright IBM Corp. 2008
 *
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index dd17537b9a9d..b7841546991f 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -1,7 +1,7 @@
 /*
- * asm-s390/kvm_host.h - definition for kernel virtual machines on s390
+ * definition for kernel virtual machines on s390
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/include/asm/kvm_para.h b/arch/s390/include/asm/kvm_para.h
index a98832961035..da44867de60f 100644
--- a/arch/s390/include/asm/kvm_para.h
+++ b/arch/s390/include/asm/kvm_para.h
@@ -1,5 +1,5 @@
 /*
- * asm-s390/kvm_para.h - definition for paravirtual devices on s390
+ * definition for paravirtual devices on s390
 *
 * Copyright IBM Corp. 2008
 *
diff --git a/arch/s390/include/asm/kvm_virtio.h b/arch/s390/include/asm/kvm_virtio.h
index 72f614181eff..44a438ca9e72 100644
--- a/arch/s390/include/asm/kvm_virtio.h
+++ b/arch/s390/include/asm/kvm_virtio.h
@@ -1,5 +1,5 @@
 /*
- * kvm_virtio.h - definition for virtio for kvm on s390
+ * definition for virtio for kvm on s390
 *
 * Copyright IBM Corp. 2008
 *
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 47853debb3b9..aab5555bbbda 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Hartmut Penner <hp@de.ibm.com>,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Denis Joseph Barrow,
@@ -302,12 +302,7 @@ struct _lowcore {
         */
        __u64   ipib;                           /* 0x0e00 */
        __u32   ipib_checksum;                  /* 0x0e08 */
-        /*
+        __u64   vmcore_info;                    /* 0x0e0c */
-         * Because the vmcore_info pointer is not 8 byte aligned it never
-         * should not be accessed directly. For accessing the pointer, first
-         * copy it to a local pointer variable.
-         */
-        __u8    vmcore_info[8];                 /* 0x0e0c */
        __u8    pad_0x0e14[0x0e18-0x0e14];      /* 0x0e14 */
        __u64   os_info;                        /* 0x0e18 */
        __u8    pad_0x0e20[0x0f00-0x0e20];      /* 0x0e20 */
diff --git a/arch/s390/include/asm/mathemu.h b/arch/s390/include/asm/mathemu.h
index e8dd1ba8edb0..614dfaf47f71 100644
--- a/arch/s390/include/asm/mathemu.h
+++ b/arch/s390/include/asm/mathemu.h
@@ -1,9 +1,8 @@
 /*
- *  arch/s390/kernel/mathemu.h
 *    IEEE floating point emulation.
 *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h
index d49760e63506..abc1932ac4e1 100644
--- a/arch/s390/include/asm/mman.h
+++ b/arch/s390/include/asm/mman.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/mman.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/mman.h"
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 69bdf72e95ec..5c63615f1349 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/mmu_context.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/mmu_context.h"
diff --git a/arch/s390/include/asm/monwriter.h b/arch/s390/include/asm/monwriter.h
index f0cbf96c52e6..f845c8e2f861 100644
--- a/arch/s390/include/asm/monwriter.h
+++ b/arch/s390/include/asm/monwriter.h
@@ -1,7 +1,5 @@
 /*
- * include/asm-s390/monwriter.h
+ * Copyright IBM Corp. 2006
- *
- * Copyright (C) IBM Corp. 2006
 * Character device driver for writing z/VM APPLDATA monitor records
 * Version 1.0
 * Author(s): Melissa Howland <melissah@us.ibm.com>
diff --git a/arch/s390/include/asm/nmi.h b/arch/s390/include/asm/nmi.h
index f4b60441adca..35f8ec185616 100644
--- a/arch/s390/include/asm/nmi.h
+++ b/arch/s390/include/asm/nmi.h
@@ -1,7 +1,7 @@
 /*
 *   Machine check handler definitions
 *
- *    Copyright IBM Corp. 2000,2009
+ *    Copyright IBM Corp. 2000, 2009
 *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Cornelia Huck <cornelia.huck@de.ibm.com>,
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index f7ec548c2b9d..27ab3c7c1e8b 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/page.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Hartmut Penner (hp@de.ibm.com)
 */
diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
index 43078c194394..590c3219c634 100644
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/pgalloc.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Hartmut Penner (hp@de.ibm.com)
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index b3227415abda..6bd7d7483017 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/pgtable.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Hartmut Penner (hp@de.ibm.com)
 *               Ulrich Weigand (weigand@de.ibm.com)
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
diff --git a/arch/s390/include/asm/posix_types.h b/arch/s390/include/asm/posix_types.h
index 7be104c0f192..7bcc14e395f0 100644
--- a/arch/s390/include/asm/posix_types.h
+++ b/arch/s390/include/asm/posix_types.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/posix_types.h
- *
 *  S390 version
 *
 */
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 20d0585cf905..c40fa91e38a8 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/processor.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Hartmut Penner (hp@de.ibm.com),
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
@@ -348,4 +346,14 @@ extern void (*s390_base_ext_handler_fn)(void);
        ".previous\n"
 #endif
+extern int memcpy_real(void *, void *, size_t);
+extern void memcpy_absolute(void *, void *, size_t);
+#define mem_assign_absolute(dest, val) {                        \
+        __typeof__(dest) __tmp = (val);                         \
+                                                                \
+        BUILD_BUG_ON(sizeof(__tmp) != sizeof(val));             \
+        memcpy_absolute(&(dest), &__tmp, sizeof(__tmp));        \
+}
 #endif                                 /* __ASM_S390_PROCESSOR_H           */
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index aeb77f017985..d5f08ea566ed 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/ptrace.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
 */
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index f039d86adf67..57d0d7e794b1 100644
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -1,7 +1,5 @@
 /*
- * linux/include/asm-s390/qdio.h
+ * Copyright IBM Corp. 2000, 2008
- *
- * Copyright 2000,2008 IBM Corp.
 * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
 *            Jan Glauber <jang@linux.vnet.ibm.com>
 *
diff --git a/arch/s390/include/asm/qeth.h b/arch/s390/include/asm/qeth.h
index 2c7c898c03e4..3a896cf52589 100644
--- a/arch/s390/include/asm/qeth.h
+++ b/arch/s390/include/asm/qeth.h
@@ -1,9 +1,7 @@
 /*
- * include/asm-s390/qeth.h
- *
 * ioctl definitions for qeth driver
 *
- * Copyright (C) 2004 IBM Corporation
+ * Copyright IBM Corp. 2004
 *
 * Author(s):   Thomas Spatzier <tspat@de.ibm.com>
 *
diff --git a/arch/s390/include/asm/reset.h b/arch/s390/include/asm/reset.h
index 3d6ad4ad2a3f..804578587a7a 100644
--- a/arch/s390/include/asm/reset.h
+++ b/arch/s390/include/asm/reset.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/reset.h
- *
 *    Copyright IBM Corp. 2006
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/resource.h b/arch/s390/include/asm/resource.h
index 366c01de04f2..ec23d1c73c92 100644
--- a/arch/s390/include/asm/resource.h
+++ b/arch/s390/include/asm/resource.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/resource.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/resources.h"
diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h
index 1ceee10264c3..487f9b64efb9 100644
--- a/arch/s390/include/asm/rwsem.h
+++ b/arch/s390/include/asm/rwsem.h
@@ -2,10 +2,8 @@
 #define _S390_RWSEM_H
 /*
- *  include/asm-s390/rwsem.h
- *
 *  S390 version
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 2002
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Based on asm-alpha/semaphore.h and asm-i386/rwsem.h
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index bf238c55740b..e62a555557ee 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/sclp.h
- *
 *    Copyright IBM Corp. 2007
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 */
@@ -55,5 +53,7 @@ int sclp_chp_configure(struct chp_id chpid);
 int sclp_chp_deconfigure(struct chp_id chpid);
 int sclp_chp_read_info(struct sclp_chp_info *info);
 void sclp_get_ipl_info(struct sclp_ipl_info *info);
+bool sclp_has_linemode(void);
+bool sclp_has_vt220(void);
 #endif /* _ASM_S390_SCLP_H */
diff --git a/arch/s390/include/asm/scsw.h b/arch/s390/include/asm/scsw.h
index de389cb54d28..4071d00978cb 100644
--- a/arch/s390/include/asm/scsw.h
+++ b/arch/s390/include/asm/scsw.h
@@ -1,7 +1,7 @@
 /*
 *  Helper functions for scsw access.
 *
- *    Copyright IBM Corp. 2008,2009
+ *    Copyright IBM Corp. 2008, 2009
 *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
 */
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 40eb2ff88e9e..57e80534375a 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/setup.h
- *
 *  S390 version
- *    Copyright IBM Corp. 1999,2010
+ *    Copyright IBM Corp. 1999, 2010
 */
 #ifndef _ASM_S390_SETUP_H
diff --git a/arch/s390/include/asm/shmparam.h b/arch/s390/include/asm/shmparam.h
index c2e0c0508e73..e985182738f8 100644
--- a/arch/s390/include/asm/shmparam.h
+++ b/arch/s390/include/asm/shmparam.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/shmparam.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/shmparam.h"
diff --git a/arch/s390/include/asm/sigcontext.h b/arch/s390/include/asm/sigcontext.h
index aeb6e0b13329..584787f6ce44 100644
--- a/arch/s390/include/asm/sigcontext.h
+++ b/arch/s390/include/asm/sigcontext.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/sigcontext.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 */
 #ifndef _ASM_S390_SIGCONTEXT_H
diff --git a/arch/s390/include/asm/siginfo.h b/arch/s390/include/asm/siginfo.h
index e0ff1ab054be..91fd3e4b70ce 100644
--- a/arch/s390/include/asm/siginfo.h
+++ b/arch/s390/include/asm/siginfo.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/siginfo.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/siginfo.h"
diff --git a/arch/s390/include/asm/signal.h b/arch/s390/include/asm/signal.h
index cdf5cb2fe03f..6d4d9d1faee9 100644
--- a/arch/s390/include/asm/signal.h
+++ b/arch/s390/include/asm/signal.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/signal.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/signal.h"
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
new file mode 100644
index 000000000000..5a87d16d3e7c
--- /dev/null
+++ b/arch/s390/include/asm/sigp.h
@@ -0,0 +1,32 @@
+#ifndef __S390_ASM_SIGP_H
+#define __S390_ASM_SIGP_H
+/* SIGP order codes */
+#define SIGP_SENSE                    1
+#define SIGP_EXTERNAL_CALL            2
+#define SIGP_EMERGENCY_SIGNAL         3
+#define SIGP_STOP                     5
+#define SIGP_RESTART                  6
+#define SIGP_STOP_AND_STORE_STATUS    9
+#define SIGP_INITIAL_CPU_RESET       11
+#define SIGP_SET_PREFIX              13
+#define SIGP_STORE_STATUS_AT_ADDRESS 14
+#define SIGP_SET_ARCHITECTURE        18
+#define SIGP_SENSE_RUNNING           21
+/* SIGP condition codes */
+#define SIGP_CC_ORDER_CODE_ACCEPTED 0
+#define SIGP_CC_STATUS_STORED       1
+#define SIGP_CC_BUSY                2
+#define SIGP_CC_NOT_OPERATIONAL     3
+/* SIGP cpu status bits */
+#define SIGP_STATUS_CHECK_STOP          0x00000010UL
+#define SIGP_STATUS_STOPPED             0x00000040UL
+#define SIGP_STATUS_EXT_CALL_PENDING    0x00000080UL
+#define SIGP_STATUS_INVALID_PARAMETER   0x00000100UL
+#define SIGP_STATUS_INCORRECT_STATE     0x00000200UL
+#define SIGP_STATUS_NOT_RUNNING         0x00000400UL
+#endif /* __S390_ASM_SIGP_H */
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index 0b6f586c1383..a0a8340daafa 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Denis Joseph Barrow,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Heiko Carstens <heiko.carstens@de.ibm.com>,
diff --git a/arch/s390/include/asm/socket.h b/arch/s390/include/asm/socket.h
index c91b720965c0..69718cd6d635 100644
--- a/arch/s390/include/asm/socket.h
+++ b/arch/s390/include/asm/socket.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/socket.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/socket.h"
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index fd94dfec8d08..701fe8c59e1f 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/spinlock.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
 *  Derived from "include/asm-i386/spinlock.h"
diff --git a/arch/s390/include/asm/stat.h b/arch/s390/include/asm/stat.h
index d92959eebb65..b4ca97d91466 100644
--- a/arch/s390/include/asm/stat.h
+++ b/arch/s390/include/asm/stat.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/stat.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/stat.h"
diff --git a/arch/s390/include/asm/statfs.h b/arch/s390/include/asm/statfs.h
index 3be7fbd406c8..5acca0a34c20 100644
--- a/arch/s390/include/asm/statfs.h
+++ b/arch/s390/include/asm/statfs.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/statfs.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/statfs.h"
diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h
index 8cc160c9e1cb..1bd1352fa3b5 100644
--- a/arch/s390/include/asm/string.h
+++ b/arch/s390/include/asm/string.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/string.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 */
diff --git a/arch/s390/include/asm/swab.h b/arch/s390/include/asm/swab.h
index a3e4ebb32090..da3bfe5cc161 100644
--- a/arch/s390/include/asm/swab.h
+++ b/arch/s390/include/asm/swab.h
@@ -2,10 +2,8 @@
 #define _S390_SWAB_H
 /*
- *  include/asm-s390/swab.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h
index 79d3d6e2e9c5..282ee36f6162 100644
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
@@ -1,7 +1,7 @@
 /*
 * definition for store system information stsi
 *
- * Copyright IBM Corp. 2001,2008
+ * Copyright IBM Corp. 2001, 2008
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/include/asm/tape390.h b/arch/s390/include/asm/tape390.h
index 884fba48f1ff..b2bc4bab7929 100644
--- a/arch/s390/include/asm/tape390.h
+++ b/arch/s390/include/asm/tape390.h
@@ -1,10 +1,9 @@
 /*************************************************************************
 *
- * tape390.h
 *         enables user programs to display messages and control encryption
 *         on s390 tape devices
 *
- *         Copyright IBM Corp. 2001,2006
+ *         Copyright IBM Corp. 2001, 2006
 *         Author(s): Michael Holzheu <holzheu@de.ibm.com>
 *
 *************************************************************************/
diff --git a/arch/s390/include/asm/termios.h b/arch/s390/include/asm/termios.h
index bc3a35cefc96..cb9fe2786b81 100644
--- a/arch/s390/include/asm/termios.h
+++ b/arch/s390/include/asm/termios.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/termios.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/termios.h"
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index 4e40b25cd060..bb08e2afc5de 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/thread_info.h
- *
 *  S390 version
- *    Copyright (C) IBM Corp. 2002,2006
+ *    Copyright IBM Corp. 2002, 2006
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/include/asm/timer.h b/arch/s390/include/asm/timer.h
deleted file mode 100644
index 15d647901e5c..000000000000
--- a/arch/s390/include/asm/timer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  include/asm-s390/timer.h
- *
- *  (C) Copyright IBM Corp. 2003,2006
- *  Virtual CPU timer
- *
- *  Author: Jan Glauber (jang@de.ibm.com)
- */
-#ifndef _ASM_S390_TIMER_H
-#define _ASM_S390_TIMER_H
-#include <linux/timer.h>
-#define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
-struct vtimer_list {
-        struct list_head entry;
-        int cpu;
-        __u64 expires;
-        __u64 interval;
-        void (*function)(unsigned long);
-        unsigned long data;
-};
-/* the vtimer value will wrap after ca. 71 years */
-struct vtimer_queue {
-        struct list_head list;
-        spinlock_t lock;
-        __u64 timer;            /* last programmed timer */
-        __u64 elapsed;          /* elapsed time of timer expire values */
-        __u64 idle_enter;       /* cpu timer on idle enter */
-        __u64 idle_exit;        /* cpu timer on idle exit */
-};
-extern void init_virt_timer(struct vtimer_list *timer);
-extern void add_virt_timer(void *new);
-extern void add_virt_timer_periodic(void *new);
-extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
-extern int mod_virt_timer_periodic(struct vtimer_list *timer, __u64 expires);
-extern int del_virt_timer(struct vtimer_list *timer);
-extern void init_cpu_vtimer(void);
-extern void vtime_init(void);
-extern void vtime_stop_cpu(void);
-extern void vtime_start_leave(void);
-#endif /* _ASM_S390_TIMER_H */
diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
index 239ece9e53c1..fba4d66788a2 100644
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/timex.h
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *
 *  Derived from "include/asm-i386/timex.h"
 *    Copyright (C) 1992, Linus Torvalds
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 6c8c35f8df14..6ba7c2c7217a 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/types.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/types.h"
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 1f3a79bcd262..a8ab18b18b54 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -1,8 +1,6 @@
 /*
- *  include/asm-s390/uaccess.h
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Hartmut Penner (hp@de.ibm.com),
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
@@ -381,8 +379,6 @@ clear_user(void __user *to, unsigned long n)
        return n;
 }
-extern int memcpy_real(void *, void *, size_t);
-extern void memcpy_absolute(void *, void *, size_t);
 extern int copy_to_user_real(void __user *dest, void *src, size_t count);
 extern int copy_from_user_real(void *dest, void __user *src, size_t count);
diff --git a/arch/s390/include/asm/ucontext.h b/arch/s390/include/asm/ucontext.h
index cfb874e66c9a..200e06325c6a 100644
--- a/arch/s390/include/asm/ucontext.h
+++ b/arch/s390/include/asm/ucontext.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/ucontext.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/ucontext.h"
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 8a8008fe7b8f..2e37157ba6a9 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/unistd.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/unistd.h"
diff --git a/arch/s390/include/asm/user.h b/arch/s390/include/asm/user.h
index 1b050e35fdc6..6ed1d1886333 100644
--- a/arch/s390/include/asm/user.h
+++ b/arch/s390/include/asm/user.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-s390/user.h
- *
 *  S390 version
 *
 *  Derived from "include/asm-i386/usr.h"
diff --git a/arch/s390/include/asm/vtimer.h b/arch/s390/include/asm/vtimer.h
new file mode 100644
index 000000000000..bfe25d513ad2
--- /dev/null
+++ b/arch/s390/include/asm/vtimer.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright IBM Corp. 2003, 2012
+ *  Virtual CPU timer
+ *
+ *  Author(s): Jan Glauber <jan.glauber@de.ibm.com>
+ */
+#ifndef _ASM_S390_TIMER_H
+#define _ASM_S390_TIMER_H
+#define VTIMER_MAX_SLICE (0x7fffffffffffffffULL)
+struct vtimer_list {
+        struct list_head entry;
+        u64 expires;
+        u64 interval;
+        void (*function)(unsigned long);
+        unsigned long data;
+};
+extern void init_virt_timer(struct vtimer_list *timer);
+extern void add_virt_timer(struct vtimer_list *timer);
+extern void add_virt_timer_periodic(struct vtimer_list *timer);
+extern int mod_virt_timer(struct vtimer_list *timer, u64 expires);
+extern int mod_virt_timer_periodic(struct vtimer_list *timer, u64 expires);
+extern int del_virt_timer(struct vtimer_list *timer);
+extern void init_cpu_vtimer(void);
+extern void vtime_init(void);
+extern void vtime_stop_cpu(void);
+#endif /* _ASM_S390_TIMER_H */
diff --git a/arch/s390/include/asm/vtoc.h b/arch/s390/include/asm/vtoc.h
index 8406a2b3157a..221419de275e 100644
--- a/arch/s390/include/asm/vtoc.h
+++ b/arch/s390/include/asm/vtoc.h
@@ -1,9 +1,7 @@
 /*
- * include/asm-s390/vtoc.h
- *
 * This file contains volume label definitions for DASD devices.
 *
- * (C) Copyright IBM Corp. 2005
+ * Copyright IBM Corp. 2005
 *
 * Author(s): Volker Sameske <sameske@de.ibm.com>
 *
diff --git a/arch/s390/include/asm/zcrypt.h b/arch/s390/include/asm/zcrypt.h
index 00d3bbd44117..e83fc116f5bf 100644
--- a/arch/s390/include/asm/zcrypt.h
+++ b/arch/s390/include/asm/zcrypt.h
@@ -3,7 +3,7 @@
 *
 *  zcrypt 2.1.0 (user-visible header)
 *
- *  Copyright (C)  2001, 2006 IBM Corporation
+ *  Copyright IBM Corp. 2001, 2006
 *  Author(s): Robert Burroughs
 *             Eric Rossman (edrossma@us.ibm.com)
 *
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 83e6edf5cf17..45ef1a7b08f9 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -9,7 +9,6 @@
 #include <linux/kbuild.h>
 #include <linux/sched.h>
 #include <asm/cputime.h>
-#include <asm/timer.h>
 #include <asm/vdso.h>
 #include <asm/pgtable.h>
@@ -72,11 +71,10 @@ int main(void)
        DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
        BLANK();
        /* idle data offsets */
-        DEFINE(__IDLE_ENTER, offsetof(struct s390_idle_data, idle_enter));
+        DEFINE(__CLOCK_IDLE_ENTER, offsetof(struct s390_idle_data, clock_idle_enter));
-        DEFINE(__IDLE_EXIT, offsetof(struct s390_idle_data, idle_exit));
+        DEFINE(__CLOCK_IDLE_EXIT, offsetof(struct s390_idle_data, clock_idle_exit));
-        /* vtimer queue offsets */
+        DEFINE(__TIMER_IDLE_ENTER, offsetof(struct s390_idle_data, timer_idle_enter));
-        DEFINE(__VQ_IDLE_ENTER, offsetof(struct vtimer_queue, idle_enter));
+        DEFINE(__TIMER_IDLE_EXIT, offsetof(struct s390_idle_data, timer_idle_exit));
-        DEFINE(__VQ_IDLE_EXIT, offsetof(struct vtimer_queue, idle_exit));
        /* lowcore offsets */
        DEFINE(__LC_EXT_PARAMS, offsetof(struct _lowcore, ext_params));
        DEFINE(__LC_EXT_CPU_ADDR, offsetof(struct _lowcore, ext_cpu_addr));
@@ -131,6 +129,8 @@ int main(void)
        DEFINE(__LC_PANIC_STACK, offsetof(struct _lowcore, panic_stack));
        DEFINE(__LC_RESTART_STACK, offsetof(struct _lowcore, restart_stack));
        DEFINE(__LC_RESTART_FN, offsetof(struct _lowcore, restart_fn));
+        DEFINE(__LC_RESTART_DATA, offsetof(struct _lowcore, restart_data));
+        DEFINE(__LC_RESTART_SOURCE, offsetof(struct _lowcore, restart_source));
        DEFINE(__LC_USER_ASCE, offsetof(struct _lowcore, user_asce));
        DEFINE(__LC_INT_CLOCK, offsetof(struct _lowcore, int_clock));
        DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock));
diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S
index c880ff72db44..797a823a2275 100644
--- a/arch/s390/kernel/base.S
+++ b/arch/s390/kernel/base.S
@@ -1,7 +1,7 @@
 /*
 *  arch/s390/kernel/base.S
 *
- *    Copyright IBM Corp. 2006,2007
+ *    Copyright IBM Corp. 2006, 2007
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 *               Michael Holzheu <holzheu@de.ibm.com>
 */
@@ -9,6 +9,7 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/ptrace.h>
+#include <asm/sigp.h>
 #ifdef CONFIG_64BIT
@@ -100,7 +101,7 @@ ENTRY(diag308_reset)
 .Lrestart_part2:
        lhi     %r0,0                   # Load r0 with zero
        lhi     %r1,2                   # Use mode 2 = ESAME (dump)
-        sigp    %r1,%r0,0x12            # Switch to ESAME mode
+        sigp    %r1,%r0,SIGP_SET_ARCHITECTURE   # Switch to ESAME mode
        sam64                           # Switch to 64 bit addressing mode
        larl    %r4,.Lctlregs           # Restore control registers
        lctlg   %c0,%c15,0(%r4)
diff --git a/arch/s390/kernel/bitmap.c b/arch/s390/kernel/bitmap.c
index 3ae4757b006a..102da5e23037 100644
--- a/arch/s390/kernel/bitmap.c
+++ b/arch/s390/kernel/bitmap.c
@@ -2,7 +2,7 @@
 *    Bitmaps for set_bit, clear_bit, test_and_set_bit, ...
 *    See include/asm/{bitops.h|posix_types.h} for details
 *
- *    Copyright IBM Corp. 1999,2009
+ *    Copyright IBM Corp. 1999, 2009
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 */
diff --git a/arch/s390/kernel/compat_exec_domain.c b/arch/s390/kernel/compat_exec_domain.c
index 914d49444f92..765fabdada9f 100644
--- a/arch/s390/kernel/compat_exec_domain.c
+++ b/arch/s390/kernel/compat_exec_domain.c
@@ -1,7 +1,7 @@
 /*
 * Support for 32-bit Linux for S390 personality.
 *
- * Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Copyright IBM Corp. 2000
 * Author(s): Gerhard Tonn (ton@de.ibm.com)
 *
 *
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 65426525d9f2..d1225089a4bb 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390x/kernel/linux32.c
- *
 *  S390 version
- *    Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 2000
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Gerhard Tonn (ton@de.ibm.com)   
 *               Thomas Spatzier (tspat@de.ibm.com)
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 3c0c19830c37..a1e8a8694bb7 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -1,7 +1,5 @@
 /*
- *  arch/s390/kernel/compat_signal.c
+ *    Copyright IBM Corp. 2000, 2006
- *
- *    Copyright (C) IBM Corp. 2000,2006
 *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
 *               Gerhard Tonn (ton@de.ibm.com)                  
 *
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index ff605a39cf43..e835d6d5b7fd 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1,8 +1,7 @@
 /*
-*  arch/s390/kernel/compat_wrapper.S
 *    wrapper for 31 bit compatible system calls.
 *
-*    Copyright (C) IBM Corp. 2000,2006
+*    Copyright IBM Corp. 2000, 2006
 *    Author(s): Gerhard Tonn (ton@de.ibm.com),
 *               Thomas Spatzier (tspat@de.ibm.com)
 */
diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c
index e3dd886e1b32..d7b0c4d27880 100644
--- a/arch/s390/kernel/cpcmd.c
+++ b/arch/s390/kernel/cpcmd.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/kernel/cpcmd.c
- *
 *  S390 version
- *    Copyright IBM Corp. 1999,2007
+ *    Copyright IBM Corp. 1999, 2007
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Christian Borntraeger (cborntra@de.ibm.com),
 */
diff --git a/arch/s390/kernel/crash.c b/arch/s390/kernel/crash.c
index 8cc7c9fa64f5..3819153de8bd 100644
--- a/arch/s390/kernel/crash.c
+++ b/arch/s390/kernel/crash.c
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/crash.c
+ * Copyright IBM Corp. 2005
- *
- * (C) Copyright IBM Corp. 2005
 *
 * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 *
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 19e5e9eba546..21be961e8a43 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -1,5 +1,4 @@
 /*
- *  arch/s390/kernel/debug.c
 *   S/390 debug facility
 *
 *    Copyright IBM Corp. 1999, 2012
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 3221c6fca8bb..1f6b428e2762 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1,6 +1,4 @@
 /*
- * arch/s390/kernel/dis.c
- *
 * Disassemble s390 instructions.
 *
 * Copyright IBM Corp. 2007
@@ -613,6 +611,7 @@ static struct insn opcode_b2[] = {
        { "sie", 0x14, INSTR_S_RD },
        { "pc", 0x18, INSTR_S_RD },
        { "sac", 0x19, INSTR_S_RD },
+        { "servc", 0x20, INSTR_RRE_RR },
        { "cfc", 0x1a, INSTR_S_RD },
        { "ipte", 0x21, INSTR_RRE_RR },
        { "ipm", 0x22, INSTR_RRE_R0 },
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 6684fff17558..bc95a8ebd9cc 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/kernel/early.c
- *
 *    Copyright IBM Corp. 2007, 2009
 *    Author(s): Hongjie Yang <hongjie@us.ibm.com>,
 *               Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/arch/s390/kernel/ebcdic.c b/arch/s390/kernel/ebcdic.c
index cc0dc609d738..b971c6be6298 100644
--- a/arch/s390/kernel/ebcdic.c
+++ b/arch/s390/kernel/ebcdic.c
@@ -1,10 +1,9 @@
 /*
- *  arch/s390/kernel/ebcdic.c
 *    ECBDIC -> ASCII, ASCII -> ECBDIC,
 *    upper to lower case (EBCDIC) conversion tables.
 *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
 *               Martin Peschke <peschke@fh-brandenburg.de>
 */
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 1ae93b573d7d..870bad6d56fc 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/kernel/entry.S
 *    S390 low-level entry points.
 *
- *    Copyright (C) IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Hartmut Penner (hp@de.ibm.com),
 *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
@@ -18,6 +17,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
+#include <asm/sigp.h>
 __PT_R0      =  __PT_GPRS
 __PT_R1      =  __PT_GPRS + 4
@@ -616,17 +616,13 @@ ext_skip:
 * Load idle PSW. The second "half" of this function is in cleanup_idle.
 */
 ENTRY(psw_idle)
-        st      %r4,__SF_EMPTY(%r15)
+        st      %r3,__SF_EMPTY(%r15)
        basr    %r1,0
        la      %r1,psw_idle_lpsw+4-.(%r1)
        st      %r1,__SF_EMPTY+4(%r15)
        oi      __SF_EMPTY+4(%r15),0x80
-        la      %r1,.Lvtimer_max-psw_idle_lpsw-4(%r1)
+        stck    __CLOCK_IDLE_ENTER(%r2)
-        stck    __IDLE_ENTER(%r2)
+        stpt    __TIMER_IDLE_ENTER(%r2)
-        ltr     %r5,%r5
-        stpt    __VQ_IDLE_ENTER(%r3)
-        jz      psw_idle_lpsw
-        spt     0(%r1)
 psw_idle_lpsw:
        lpsw    __SF_EMPTY(%r15)
        br      %r14
@@ -723,15 +719,17 @@ ENTRY(restart_int_handler)
        mvc     __PT_PSW(8,%r15),__LC_RST_OLD_PSW # store restart old psw
        ahi     %r15,-STACK_FRAME_OVERHEAD      # create stack frame on stack
        xc      0(STACK_FRAME_OVERHEAD,%r15),0(%r15)
-        lm      %r1,%r3,__LC_RESTART_FN         # load fn, parm & source cpu
+        l       %r1,__LC_RESTART_FN             # load fn, parm & source cpu
+        l       %r2,__LC_RESTART_DATA
+        l       %r3,__LC_RESTART_SOURCE
        ltr     %r3,%r3                         # test source cpu address
        jm      1f                              # negative -> skip source stop
-0:      sigp    %r4,%r3,1                       # sigp sense to source cpu
+0:      sigp    %r4,%r3,SIGP_SENSE              # sigp sense to source cpu
        brc     10,0b                           # wait for status stored
 1:      basr    %r14,%r1                        # call function
        stap    __SF_EMPTY(%r15)                # store cpu address
        lh      %r3,__SF_EMPTY(%r15)
-2:      sigp    %r4,%r3,5                       # sigp stop to current cpu
+2:      sigp    %r4,%r3,SIGP_STOP               # sigp stop to current cpu
        brc     2,2b
 3:      j       3b
@@ -883,33 +881,28 @@ cleanup_io_restore_insn:
 cleanup_idle:
        # copy interrupt clock & cpu timer
-        mvc     __IDLE_EXIT(8,%r2),__LC_INT_CLOCK
+        mvc     __CLOCK_IDLE_EXIT(8,%r2),__LC_INT_CLOCK
-        mvc     __VQ_IDLE_EXIT(8,%r3),__LC_ASYNC_ENTER_TIMER
+        mvc     __TIMER_IDLE_EXIT(8,%r2),__LC_ASYNC_ENTER_TIMER
        chi     %r11,__LC_SAVE_AREA_ASYNC
        je      0f
-        mvc     __IDLE_EXIT(8,%r2),__LC_MCCK_CLOCK
+        mvc     __CLOCK_IDLE_EXIT(8,%r2),__LC_MCCK_CLOCK
-        mvc     __VQ_IDLE_EXIT(8,%r3),__LC_MCCK_ENTER_TIMER
+        mvc     __TIMER_IDLE_EXIT(8,%r2),__LC_MCCK_ENTER_TIMER
 0:      # check if stck has been executed
        cl      %r9,BASED(cleanup_idle_insn)
        jhe     1f
-        mvc     __IDLE_ENTER(8,%r2),__IDLE_EXIT(%r2)
+        mvc     __CLOCK_IDLE_ENTER(8,%r2),__CLOCK_IDLE_EXIT(%r2)
-        mvc     __VQ_IDLE_ENTER(8,%r3),__VQ_IDLE_EXIT(%r3)
+        mvc     __TIMER_IDLE_ENTER(8,%r2),__TIMER_IDLE_EXIT(%r3)
-        j       2f
+1:      # account system time going idle
-1:      # check if the cpu timer has been reprogrammed
-        ltr     %r5,%r5
-        jz      2f
-        spt     __VQ_IDLE_ENTER(%r3)
-2:      # account system time going idle
        lm      %r9,%r10,__LC_STEAL_TIMER
-        ADD64   %r9,%r10,__IDLE_ENTER(%r2)
+        ADD64   %r9,%r10,__CLOCK_IDLE_ENTER(%r2)
        SUB64   %r9,%r10,__LC_LAST_UPDATE_CLOCK
        stm     %r9,%r10,__LC_STEAL_TIMER
-        mvc     __LC_LAST_UPDATE_CLOCK(8),__IDLE_EXIT(%r2)
+        mvc     __LC_LAST_UPDATE_CLOCK(8),__CLOCK_IDLE_EXIT(%r2)
        lm      %r9,%r10,__LC_SYSTEM_TIMER
        ADD64   %r9,%r10,__LC_LAST_UPDATE_TIMER
-        SUB64   %r9,%r10,__VQ_IDLE_ENTER(%r3)
+        SUB64   %r9,%r10,__TIMER_IDLE_ENTER(%r2)
        stm     %r9,%r10,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__VQ_IDLE_EXIT(%r3)
+        mvc     __LC_LAST_UPDATE_TIMER(8),__TIMER_IDLE_EXIT(%r2)
        # prepare return psw
        n       %r8,BASED(cleanup_idle_wait)    # clear wait state bit
        l       %r9,24(%r11)                    # return from psw_idle
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index f66a229ab0b3..a5f4dc42a5db 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -5,7 +5,6 @@
 #include <linux/signal.h>
 #include <asm/ptrace.h>
 #include <asm/cputime.h>
-#include <asm/timer.h>
 extern void (*pgm_check_table[128])(struct pt_regs *);
 extern void *restart_stack;
@@ -17,8 +16,7 @@ void io_int_handler(void);
 void mcck_int_handler(void);
 void restart_int_handler(void);
 void restart_call_handler(void);
-void psw_idle(struct s390_idle_data *, struct vtimer_queue *,
+void psw_idle(struct s390_idle_data *, unsigned long);
-              unsigned long, int);
 asmlinkage long do_syscall_trace_enter(struct pt_regs *regs);
 asmlinkage void do_syscall_trace_exit(struct pt_regs *regs);
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 229fe1d07749..349b7eeb348a 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/kernel/entry64.S
 *    S390 low-level entry points.
 *
- *    Copyright (C) IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Hartmut Penner (hp@de.ibm.com),
 *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
@@ -18,6 +17,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
+#include <asm/sigp.h>
 __PT_R0      =  __PT_GPRS
 __PT_R1      =  __PT_GPRS + 8
@@ -642,15 +642,11 @@ ext_skip:
 * Load idle PSW. The second "half" of this function is in cleanup_idle.
 */
 ENTRY(psw_idle)
-        stg     %r4,__SF_EMPTY(%r15)
+        stg     %r3,__SF_EMPTY(%r15)
        larl    %r1,psw_idle_lpsw+4
        stg     %r1,__SF_EMPTY+8(%r15)
-        larl    %r1,.Lvtimer_max
+        STCK    __CLOCK_IDLE_ENTER(%r2)
-        STCK    __IDLE_ENTER(%r2)
+        stpt    __TIMER_IDLE_ENTER(%r2)
-        ltr     %r5,%r5
-        stpt    __VQ_IDLE_ENTER(%r3)
-        jz      psw_idle_lpsw
-        spt     0(%r1)
 psw_idle_lpsw:
        lpswe   __SF_EMPTY(%r15)
        br      %r14
@@ -750,15 +746,17 @@ ENTRY(restart_int_handler)
        mvc     __PT_PSW(16,%r15),__LC_RST_OLD_PSW # store restart old psw
        aghi    %r15,-STACK_FRAME_OVERHEAD      # create stack frame on stack
        xc      0(STACK_FRAME_OVERHEAD,%r15),0(%r15)
-        lmg     %r1,%r3,__LC_RESTART_FN         # load fn, parm & source cpu
+        lg      %r1,__LC_RESTART_FN             # load fn, parm & source cpu
+        lg      %r2,__LC_RESTART_DATA
+        lg      %r3,__LC_RESTART_SOURCE
        ltgr    %r3,%r3                         # test source cpu address
        jm      1f                              # negative -> skip source stop
-0:      sigp    %r4,%r3,1                       # sigp sense to source cpu
+0:      sigp    %r4,%r3,SIGP_SENSE              # sigp sense to source cpu
        brc     10,0b                           # wait for status stored
 1:      basr    %r14,%r1                        # call function
        stap    __SF_EMPTY(%r15)                # store cpu address
        llgh    %r3,__SF_EMPTY(%r15)
-2:      sigp    %r4,%r3,5                       # sigp stop to current cpu
+2:      sigp    %r4,%r3,SIGP_STOP               # sigp stop to current cpu
        brc     2,2b
 3:      j       3b
@@ -916,33 +914,28 @@ cleanup_io_restore_insn:
 cleanup_idle:
        # copy interrupt clock & cpu timer
-        mvc     __IDLE_EXIT(8,%r2),__LC_INT_CLOCK
+        mvc     __CLOCK_IDLE_EXIT(8,%r2),__LC_INT_CLOCK
-        mvc     __VQ_IDLE_EXIT(8,%r3),__LC_ASYNC_ENTER_TIMER
+        mvc     __TIMER_IDLE_EXIT(8,%r2),__LC_ASYNC_ENTER_TIMER
        cghi    %r11,__LC_SAVE_AREA_ASYNC
        je      0f
-        mvc     __IDLE_EXIT(8,%r2),__LC_MCCK_CLOCK
+        mvc     __CLOCK_IDLE_EXIT(8,%r2),__LC_MCCK_CLOCK
-        mvc     __VQ_IDLE_EXIT(8,%r3),__LC_MCCK_ENTER_TIMER
+        mvc     __TIMER_IDLE_EXIT(8,%r2),__LC_MCCK_ENTER_TIMER
 0:      # check if stck & stpt have been executed
        clg     %r9,BASED(cleanup_idle_insn)
        jhe     1f
-        mvc     __IDLE_ENTER(8,%r2),__IDLE_EXIT(%r2)
+        mvc     __CLOCK_IDLE_ENTER(8,%r2),__CLOCK_IDLE_EXIT(%r2)
-        mvc     __VQ_IDLE_ENTER(8,%r3),__VQ_IDLE_EXIT(%r3)
+        mvc     __TIMER_IDLE_ENTER(8,%r2),__TIMER_IDLE_EXIT(%r2)
-        j       2f
+1:      # account system time going idle
-1:      # check if the cpu timer has been reprogrammed
-        ltr     %r5,%r5
-        jz      2f
-        spt     __VQ_IDLE_ENTER(%r3)
-2:      # account system time going idle
        lg      %r9,__LC_STEAL_TIMER
-        alg     %r9,__IDLE_ENTER(%r2)
+        alg     %r9,__CLOCK_IDLE_ENTER(%r2)
        slg     %r9,__LC_LAST_UPDATE_CLOCK
        stg     %r9,__LC_STEAL_TIMER
-        mvc     __LC_LAST_UPDATE_CLOCK(8),__IDLE_EXIT(%r2)
+        mvc     __LC_LAST_UPDATE_CLOCK(8),__CLOCK_IDLE_EXIT(%r2)
        lg      %r9,__LC_SYSTEM_TIMER
        alg     %r9,__LC_LAST_UPDATE_TIMER
-        slg     %r9,__VQ_IDLE_ENTER(%r3)
+        slg     %r9,__TIMER_IDLE_ENTER(%r2)
        stg     %r9,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__VQ_IDLE_EXIT(%r3)
+        mvc     __LC_LAST_UPDATE_TIMER(8),__TIMER_IDLE_EXIT(%r2)
        # prepare return psw
        nihh    %r8,0xfffd              # clear wait state bit
        lg      %r9,48(%r11)            # return from psw_idle
@@ -958,8 +951,6 @@ cleanup_idle_insn:
        .quad   __critical_start
 .Lcritical_length:
        .quad   __critical_end - __critical_start
-.Lvtimer_max:
-        .quad   0x7fffffffffffffff
 #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
@@ -974,7 +965,6 @@ ENTRY(sie64a)
        stg     %r3,__SF_EMPTY+8(%r15)          # save guest register save area
        xc      __SF_EMPTY+16(8,%r15),__SF_EMPTY+16(%r15) # host id == 0
        lmg     %r0,%r13,0(%r3)                 # load guest gprs 0-13
-        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
 sie_loop:
        lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
        tm      __TI_flags+7(%r14),_TIF_EXIT_SIE
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 4939d15375aa..805b6686b641 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 1999,2010
+ * Copyright IBM Corp. 1999, 2010
 *
 *    Author(s): Hartmut Penner <hp@de.ibm.com>
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index d3f1ab7d90ad..a1372ae24ae1 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/head31.S
+ * Copyright IBM Corp. 2005, 2010
- *
- * Copyright (C) IBM Corp. 2005,2010
 *
 *   Author(s): Hartmut Penner <hp@de.ibm.com>
 *              Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 99348c0eaa41..c108af28bbe8 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/head64.S
+ * Copyright IBM Corp. 1999, 2010
- *
- * Copyright (C) IBM Corp. 1999,2010
 *
 *   Author(s): Hartmut Penner <hp@de.ibm.com>
 *              Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/arch/s390/kernel/head_kdump.S b/arch/s390/kernel/head_kdump.S
index 796c976b5fdc..acaaaf4b7055 100644
--- a/arch/s390/kernel/head_kdump.S
+++ b/arch/s390/kernel/head_kdump.S
@@ -5,6 +5,8 @@
 * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
 */
+#include <asm/sigp.h>
 #define DATAMOVER_ADDR  0x4000
 #define COPY_PAGE_ADDR  0x6000
@@ -19,7 +21,7 @@
 .align 2
 .Lep_startup_kdump:
        lhi     %r1,2                           # mode 2 = esame (dump)
-        sigp    %r1,%r0,0x12                    # Switch to esame mode
+        sigp    %r1,%r0,SIGP_SET_ARCHITECTURE   # Switch to esame mode
        sam64                                   # Switch to 64 bit addressing
        basr    %r13,0
 .Lbase:
@@ -88,7 +90,7 @@ startup_kdump_relocated:
        sam31                                   # Switch to 31 bit addr mode
        sr      %r1,%r1                         # Erase register r1
        sr      %r2,%r2                         # Erase register r2
-        sigp    %r1,%r2,0x12                    # Switch to 31 bit arch mode
+        sigp    %r1,%r2,SIGP_SET_ARCHITECTURE   # Switch to 31 bit arch mode
        lpsw    0                               # Start new kernel...
 .align  8
 .Lrestart_psw:
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 2f6cfd460cb6..e64d141555ce 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/kernel/ipl.c
 *    ipl/reipl/dump support for Linux on s390.
 *
- *    Copyright IBM Corp. 2005,2012
+ *    Copyright IBM Corp. 2005, 2012
 *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
 *               Heiko Carstens <heiko.carstens@de.ibm.com>
 *               Volker Sameske <sameske@de.ibm.com>
@@ -1528,15 +1527,12 @@ static struct shutdown_action __refdata dump_action = {
 static void dump_reipl_run(struct shutdown_trigger *trigger)
 {
-        struct {
+        unsigned long ipib = (unsigned long) reipl_block_actual;
-                void    *addr;
+        unsigned int csum;
-                __u32   csum;
-        } __packed ipib;
-        ipib.csum = csum_partial(reipl_block_actual,
+        csum = csum_partial(reipl_block_actual, reipl_block_actual->hdr.len, 0);
-                                 reipl_block_actual->hdr.len, 0);
+        mem_assign_absolute(S390_lowcore.ipib, ipib);
-        ipib.addr = reipl_block_actual;
+        mem_assign_absolute(S390_lowcore.ipib_checksum, csum);
-        memcpy_absolute(&S390_lowcore.ipib, &ipib, sizeof(ipib));
        dump_run(trigger);
 }
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index b4f4a7133fa1..dd7630d8aab7 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2004,2011
+ *    Copyright IBM Corp. 2004, 2011
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Holger Smolinski <Holger.Smolinski@de.ibm.com>,
 *               Thomas Spatzier <tspat@de.ibm.com>,
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 64b761aef004..8aa634f5944b 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -15,7 +15,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * Copyright (C) IBM Corporation, 2002, 2006
+ * Copyright IBM Corp. 2002, 2006
 *
 * s390 port, used ppc64 as template. Mike Grundy <grundym@us.ibm.com>
 */
diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c
index 87f080b17af1..eca94e74d19a 100644
--- a/arch/s390/kernel/lgr.c
+++ b/arch/s390/kernel/lgr.c
@@ -45,7 +45,7 @@ struct lgr_info {
 /*
 * LGR globals
 */
-static void *lgr_page;
+static char lgr_page[PAGE_SIZE] __aligned(PAGE_SIZE);
 static struct lgr_info lgr_info_last;
 static struct lgr_info lgr_info_cur;
 static struct debug_info *lgr_dbf;
@@ -74,7 +74,7 @@ static void cpascii(char *dst, char *src, int size)
 */
 static void lgr_stsi_1_1_1(struct lgr_info *lgr_info)
 {
-        struct sysinfo_1_1_1 *si = lgr_page;
+        struct sysinfo_1_1_1 *si = (void *) lgr_page;
        if (stsi(si, 1, 1, 1) == -ENOSYS)
                return;
@@ -91,7 +91,7 @@ static void lgr_stsi_1_1_1(struct lgr_info *lgr_info)
 */
 static void lgr_stsi_2_2_2(struct lgr_info *lgr_info)
 {
-        struct sysinfo_2_2_2 *si = lgr_page;
+        struct sysinfo_2_2_2 *si = (void *) lgr_page;
        if (stsi(si, 2, 2, 2) == -ENOSYS)
                return;
@@ -105,7 +105,7 @@ static void lgr_stsi_2_2_2(struct lgr_info *lgr_info)
 */
 static void lgr_stsi_3_2_2(struct lgr_info *lgr_info)
 {
-        struct sysinfo_3_2_2 *si = lgr_page;
+        struct sysinfo_3_2_2 *si = (void *) lgr_page;
        int i;
        if (stsi(si, 3, 2, 2) == -ENOSYS)
@@ -183,14 +183,9 @@ static void lgr_timer_set(void)
 */
 static int __init lgr_init(void)
 {
-        lgr_page = (void *) __get_free_pages(GFP_KERNEL, 0);
-        if (!lgr_page)
-                return -ENOMEM;
        lgr_dbf = debug_register("lgr", 1, 1, sizeof(struct lgr_info));
-        if (!lgr_dbf) {
+        if (!lgr_dbf)
-                free_page((unsigned long) lgr_page);
                return -ENOMEM;
-        }
        debug_register_view(lgr_dbf, &debug_hex_ascii_view);
        lgr_info_get(&lgr_info_last);
        debug_event(lgr_dbf, 1, &lgr_info_last, sizeof(lgr_info_last));
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index cdacf8f91b2d..493304bdf1c7 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/machine_kexec.c
+ * Copyright IBM Corp. 2005, 2011
- *
- * Copyright IBM Corp. 2005,2011
 *
 * Author(s): Rolf Adelsberger,
 *            Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index 7e2c38ba1373..4567ce20d900 100644
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 *   Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>,
 *
diff --git a/arch/s390/kernel/mcount64.S b/arch/s390/kernel/mcount64.S
index f70cadec68fc..11332193db30 100644
--- a/arch/s390/kernel/mcount64.S
+++ b/arch/s390/kernel/mcount64.S
@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 *   Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>,
 *
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index dfcb3436bad0..46412b1d7e1e 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -1,9 +1,8 @@
 /*
- *  arch/s390/kernel/module.c - Kernel module help for s390.
+ *  Kernel module help for s390.
 *
 *  S390 version
- *    Copyright (C) 2002, 2003 IBM Deutschland Entwicklung GmbH,
+ *    Copyright IBM Corp. 2002, 2003
- *                             IBM Corporation
 *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 8c372ca61350..a6daa5c5cdb0 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -1,7 +1,7 @@
 /*
 *   Machine check handler
 *
- *    Copyright IBM Corp. 2000,2009
+ *    Copyright IBM Corp. 2000, 2009
 *    Author(s): Ingo Adlung <adlung@de.ibm.com>,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Cornelia Huck <cornelia.huck@de.ibm.com>,
diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c
index 95fa5ac6c4ce..46480d81df00 100644
--- a/arch/s390/kernel/os_info.c
+++ b/arch/s390/kernel/os_info.c
@@ -60,7 +60,7 @@ void __init os_info_init(void)
        os_info.version_minor = OS_INFO_VERSION_MINOR;
        os_info.magic = OS_INFO_MAGIC;
        os_info.csum = os_info_csum(&os_info);
-        memcpy_absolute(&S390_lowcore.os_info, &ptr, sizeof(ptr));
+        mem_assign_absolute(S390_lowcore.os_info, (unsigned long) ptr);
 }
 #ifdef CONFIG_CRASH_DUMP
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 60055cefdd04..733175373a4c 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -1,7 +1,7 @@
 /*
 * This file handles the architecture dependent parts of process handling.
 *
- *    Copyright IBM Corp. 1999,2009
+ *    Copyright IBM Corp. 1999, 2009
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Hartmut Penner <hp@de.ibm.com>,
 *               Denis Joseph Barrow,
@@ -25,8 +25,8 @@
 #include <linux/module.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/vtimer.h>
 #include <asm/irq.h>
-#include <asm/timer.h>
 #include <asm/nmi.h>
 #include <asm/smp.h>
 #include <asm/switch_to.h>
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 6e0073e43f54..572d4c9cb33b 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/kernel/processor.c
- *
 *  Copyright IBM Corp. 2008
 *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
@@ -25,13 +23,15 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
 */
 void __cpuinit cpu_init(void)
 {
-        struct cpuid *id = &per_cpu(cpu_id, smp_processor_id());
+        struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
+        struct cpuid *id = &__get_cpu_var(cpu_id);
        get_cpu_id(id);
        atomic_inc(&init_mm.mm_count);
        current->active_mm = &init_mm;
        BUG_ON(current->mm);
        enter_lazy_tlb(&init_mm, current);
+        memset(idle, 0, sizeof(*idle));
 }
 /*
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 4993e689b2c2..f4eb37680b91 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -1,7 +1,7 @@
 /*
 *  Ptrace user space interface.
 *
- *    Copyright IBM Corp. 1999,2010
+ *    Copyright IBM Corp. 1999, 2010
 *    Author(s): Denis Joseph Barrow
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S
index ad67c214be04..dd8016b0477e 100644
--- a/arch/s390/kernel/reipl.S
+++ b/arch/s390/kernel/reipl.S
@@ -1,13 +1,12 @@
 /*
- *  arch/s390/kernel/reipl.S
- *
 *  S390 version
- *    Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 2000
 *    Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com)
 */
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
+#include <asm/sigp.h>
 #
 # store_status: Empty implementation until kdump is supported on 31 bit
@@ -60,7 +59,7 @@ ENTRY(do_reipl_asm)
                bas     %r14,.Ldisab-.Lpg0(%r13)
 .L003:          st      %r1,__LC_SUBCHANNEL_ID
                lpsw    0
-                sigp    0,0,0(6)
+                sigp    0,0,SIGP_RESTART
 .Ldisab:        st      %r14,.Ldispsw+4-.Lpg0(%r13)
                lpsw    .Ldispsw-.Lpg0(%r13)
                .align  8
diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl64.S
index 36b32658fb24..dc3b1273c4dc 100644
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl64.S
@@ -1,11 +1,12 @@
 /*
- *    Copyright IBM Corp 2000,2011
+ *    Copyright IBM Corp 2000, 2011
 *    Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
 *               Denis Joseph Barrow,
 */
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
+#include <asm/sigp.h>
 #
 # store_status
@@ -106,7 +107,7 @@ ENTRY(do_reipl_asm)
 .L003:          st      %r1,__LC_SUBCHANNEL_ID
                lhi     %r1,0            # mode 0 = esa
                slr     %r0,%r0          # set cpuid to zero
-                sigp    %r1,%r0,0x12     # switch to esa mode
+                sigp    %r1,%r0,SIGP_SET_ARCHITECTURE # switch to esa mode
                lpsw    0
 .Ldisab:        sll     %r14,1
                srl     %r14,1           # need to kill hi bit to avoid specification exceptions.
diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S
index c91d70aede91..f4e6f20e117a 100644
--- a/arch/s390/kernel/relocate_kernel.S
+++ b/arch/s390/kernel/relocate_kernel.S
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/relocate_kernel.S
+ * Copyright IBM Corp. 2005
- *
- * (C) Copyright IBM Corp. 2005
 *
 * Author(s): Rolf Adelsberger,
 *            Heiko Carstens <heiko.carstens@de.ibm.com>
@@ -9,6 +7,7 @@
 */
 #include <linux/linkage.h>
+#include <asm/sigp.h>
 /*
 * moves the new kernel to its destination...
@@ -93,7 +92,7 @@ ENTRY(relocate_kernel)
        .no_diag308:
                sr      %r1,%r1         # clear %r1
                sr      %r2,%r2         # clear %r2
-                sigp    %r1,%r2,0x12    # set cpuid to zero
+                sigp    %r1,%r2,SIGP_SET_ARCHITECTURE # set cpuid to zero
                lpsw    0               # hopefully start new kernel...
                .align  8
diff --git a/arch/s390/kernel/relocate_kernel64.S b/arch/s390/kernel/relocate_kernel64.S
index 7c3ce589a7f0..cfac28330b03 100644
--- a/arch/s390/kernel/relocate_kernel64.S
+++ b/arch/s390/kernel/relocate_kernel64.S
@@ -1,7 +1,5 @@
 /*
- * arch/s390/kernel/relocate_kernel64.S
+ * Copyright IBM Corp. 2005
- *
- * (C) Copyright IBM Corp. 2005
 *
 * Author(s): Rolf Adelsberger,
 *            Heiko Carstens <heiko.carstens@de.ibm.com>
@@ -9,6 +7,7 @@
 */
 #include <linux/linkage.h>
+#include <asm/sigp.h>
 /*
 * moves the new kernel to its destination...
@@ -45,7 +44,7 @@ ENTRY(relocate_kernel)
                diag    %r0,%r0,0x308
        .back:
                lhi     %r1,1           # mode 1 = esame
-                sigp    %r1,%r0,0x12    # switch to esame mode
+                sigp    %r1,%r0,SIGP_SET_ARCHITECTURE # switch to esame mode
                sam64                   # switch to 64 bit addressing mode
                basr    %r13,0
        .back_base:
@@ -96,7 +95,7 @@ ENTRY(relocate_kernel)
                sam31                   # 31 bit mode
                sr      %r1,%r1         # erase register r1
                sr      %r2,%r2         # erase register r2
-                sigp    %r1,%r2,0x12    # set cpuid to zero
+                sigp    %r1,%r2,SIGP_SET_ARCHITECTURE # set cpuid to zero
                lpsw    0               # hopefully start new kernel...
                .align  8
diff --git a/arch/s390/kernel/sclp.S b/arch/s390/kernel/sclp.S
index 95792d846bb6..bf053898630d 100644
--- a/arch/s390/kernel/sclp.S
+++ b/arch/s390/kernel/sclp.S
@@ -1,7 +1,7 @@
 /*
 * Mini SCLP driver.
 *
- * Copyright IBM Corp. 2004,2009
+ * Copyright IBM Corp. 2004, 2009
 *
 *   Author(s): Peter Oberparleiter <Peter.Oberparleiter@de.ibm.com>,
 *              Heiko Carstens <heiko.carstens@de.ibm.com>,
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 489d1d8d96b0..743c0f32fe3b 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/kernel/setup.c
- *
 *  S390 version
- *    Copyright (C) IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Hartmut Penner (hp@de.ibm.com),
 *               Martin Schwidefsky (schwidefsky@de.ibm.com)
 *
@@ -63,6 +61,7 @@
 #include <asm/kvm_virtio.h>
 #include <asm/diag.h>
 #include <asm/os_info.h>
+#include <asm/sclp.h>
 #include "entry.h"
 long psw_kernel_bits    = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_PRIMARY |
@@ -138,9 +137,14 @@ __setup("condev=", condev_setup);
 static void __init set_preferred_console(void)
 {
-        if (MACHINE_IS_KVM)
+        if (MACHINE_IS_KVM) {
-                add_preferred_console("hvc", 0, NULL);
+                if (sclp_has_vt220())
-        else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
+                        add_preferred_console("ttyS", 1, NULL);
+                else if (sclp_has_linemode())
+                        add_preferred_console("ttyS", 0, NULL);
+                else
+                        add_preferred_console("hvc", 0, NULL);
+        } else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
                add_preferred_console("ttyS", 0, NULL);
        else if (CONSOLE_IS_3270)
                add_preferred_console("tty3270", 0, NULL);
@@ -430,10 +434,11 @@ static void __init setup_lowcore(void)
        lc->restart_source = -1UL;
        /* Setup absolute zero lowcore */
-        memcpy_absolute(&S390_lowcore.restart_stack, &lc->restart_stack,
+        mem_assign_absolute(S390_lowcore.restart_stack, lc->restart_stack);
-                        4 * sizeof(unsigned long));
+        mem_assign_absolute(S390_lowcore.restart_fn, lc->restart_fn);
-        memcpy_absolute(&S390_lowcore.restart_psw, &lc->restart_psw,
+        mem_assign_absolute(S390_lowcore.restart_data, lc->restart_data);
-                        sizeof(lc->restart_psw));
+        mem_assign_absolute(S390_lowcore.restart_source, lc->restart_source);
+        mem_assign_absolute(S390_lowcore.restart_psw, lc->restart_psw);
        set_prefix((u32)(unsigned long) lc);
        lowcore_ptr[0] = lc;
@@ -598,9 +603,7 @@ static void __init setup_memory_end(void)
 static void __init setup_vmcoreinfo(void)
 {
 #ifdef CONFIG_KEXEC
-        unsigned long ptr = paddr_vmcoreinfo_note();
+        mem_assign_absolute(S390_lowcore.vmcore_info, paddr_vmcoreinfo_note());
-        memcpy_absolute(&S390_lowcore.vmcore_info, &ptr, sizeof(ptr));
 #endif
 }
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index ac565b44aabb..c13a2a37ef00 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -1,7 +1,5 @@
 /*
- *  arch/s390/kernel/signal.c
+ *    Copyright IBM Corp. 1999, 2006
- *
- *    Copyright (C) IBM Corp. 1999,2006
 *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
 *
 *    Based on Intel version
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 15cca26ccb6c..720fda1620f2 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1,7 +1,7 @@
 /*
 *  SMP related functions
 *
- *    Copyright IBM Corp. 1999,2012
+ *    Copyright IBM Corp. 1999, 2012
 *    Author(s): Denis Joseph Barrow,
 *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Heiko Carstens <heiko.carstens@de.ibm.com>,
@@ -38,40 +38,16 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/tlbflush.h>
-#include <asm/timer.h>
+#include <asm/vtimer.h>
 #include <asm/lowcore.h>
 #include <asm/sclp.h>
 #include <asm/vdso.h>
 #include <asm/debug.h>
 #include <asm/os_info.h>
+#include <asm/sigp.h>
 #include "entry.h"
 enum {
-        sigp_sense = 1,
-        sigp_external_call = 2,
-        sigp_emergency_signal = 3,
-        sigp_start = 4,
-        sigp_stop = 5,
-        sigp_restart = 6,
-        sigp_stop_and_store_status = 9,
-        sigp_initial_cpu_reset = 11,
-        sigp_cpu_reset = 12,
-        sigp_set_prefix = 13,
-        sigp_store_status_at_address = 14,
-        sigp_store_extended_status_at_address = 15,
-        sigp_set_architecture = 18,
-        sigp_conditional_emergency_signal = 19,
-        sigp_sense_running = 21,
-};
-enum {
-        sigp_order_code_accepted = 0,
-        sigp_status_stored = 1,
-        sigp_busy = 2,
-        sigp_not_operational = 3,
-};
-enum {
        ec_schedule = 0,
        ec_call_function,
        ec_call_function_single,
@@ -124,7 +100,7 @@ static inline int __pcpu_sigp_relax(u16 addr, u8 order, u32 parm, u32 *status)
        while (1) {
                cc = __pcpu_sigp(addr, order, parm, status);
-                if (cc != sigp_busy)
+                if (cc != SIGP_CC_BUSY)
                        return cc;
                cpu_relax();
        }
@@ -136,7 +112,7 @@ static int pcpu_sigp_retry(struct pcpu *pcpu, u8 order, u32 parm)
        for (retry = 0; ; retry++) {
                cc = __pcpu_sigp(pcpu->address, order, parm, &pcpu->status);
-                if (cc != sigp_busy)
+                if (cc != SIGP_CC_BUSY)
                        break;
                if (retry >= 3)
                        udelay(10);
@@ -146,20 +122,19 @@ static int pcpu_sigp_retry(struct pcpu *pcpu, u8 order, u32 parm)
 static inline int pcpu_stopped(struct pcpu *pcpu)
 {
-        if (__pcpu_sigp(pcpu->address, sigp_sense,
+        if (__pcpu_sigp(pcpu->address, SIGP_SENSE,
-                        0, &pcpu->status) != sigp_status_stored)
+                        0, &pcpu->status) != SIGP_CC_STATUS_STORED)
                return 0;
-        /* Check for stopped and check stop state */
+        return !!(pcpu->status & (SIGP_STATUS_CHECK_STOP|SIGP_STATUS_STOPPED));
-        return !!(pcpu->status & 0x50);
 }
 static inline int pcpu_running(struct pcpu *pcpu)
 {
-        if (__pcpu_sigp(pcpu->address, sigp_sense_running,
+        if (__pcpu_sigp(pcpu->address, SIGP_SENSE_RUNNING,
-                        0, &pcpu->status) != sigp_status_stored)
+                        0, &pcpu->status) != SIGP_CC_STATUS_STORED)
                return 1;
-        /* Check for running status */
+        /* Status stored condition code is equivalent to cpu not running. */
-        return !(pcpu->status & 0x400);
+        return 0;
 }
 /*
@@ -181,7 +156,7 @@ static void pcpu_ec_call(struct pcpu *pcpu, int ec_bit)
        set_bit(ec_bit, &pcpu->ec_mask);
        order = pcpu_running(pcpu) ?
-                sigp_external_call : sigp_emergency_signal;
+                SIGP_EXTERNAL_CALL : SIGP_EMERGENCY_SIGNAL;
        pcpu_sigp_retry(pcpu, order, 0);
 }
@@ -214,7 +189,7 @@ static int __cpuinit pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
                goto out;
 #endif
        lowcore_ptr[cpu] = lc;
-        pcpu_sigp_retry(pcpu, sigp_set_prefix, (u32)(unsigned long) lc);
+        pcpu_sigp_retry(pcpu, SIGP_SET_PREFIX, (u32)(unsigned long) lc);
        return 0;
 out:
        if (pcpu != &pcpu_devices[0]) {
@@ -229,7 +204,7 @@ out:
 static void pcpu_free_lowcore(struct pcpu *pcpu)
 {
-        pcpu_sigp_retry(pcpu, sigp_set_prefix, 0);
+        pcpu_sigp_retry(pcpu, SIGP_SET_PREFIX, 0);
        lowcore_ptr[pcpu - pcpu_devices] = NULL;
 #ifndef CONFIG_64BIT
        if (MACHINE_HAS_IEEE) {
@@ -288,7 +263,7 @@ static void pcpu_start_fn(struct pcpu *pcpu, void (*func)(void *), void *data)
        lc->restart_fn = (unsigned long) func;
        lc->restart_data = (unsigned long) data;
        lc->restart_source = -1UL;
-        pcpu_sigp_retry(pcpu, sigp_restart, 0);
+        pcpu_sigp_retry(pcpu, SIGP_RESTART, 0);
 }
 /*
@@ -298,26 +273,26 @@ static void pcpu_delegate(struct pcpu *pcpu, void (*func)(void *),
                          void *data, unsigned long stack)
 {
        struct _lowcore *lc = lowcore_ptr[pcpu - pcpu_devices];
-        struct {
+        unsigned long source_cpu = stap();
-                unsigned long   stack;
-                void            *func;
-                void            *data;
-                unsigned long   source;
-        } restart = { stack, func, data, stap() };
        __load_psw_mask(psw_kernel_bits);
-        if (pcpu->address == restart.source)
+        if (pcpu->address == source_cpu)
                func(data);     /* should not return */
        /* Stop target cpu (if func returns this stops the current cpu). */
-        pcpu_sigp_retry(pcpu, sigp_stop, 0);
+        pcpu_sigp_retry(pcpu, SIGP_STOP, 0);
        /* Restart func on the target cpu and stop the current cpu. */
-        memcpy_absolute(&lc->restart_stack, &restart, sizeof(restart));
+        mem_assign_absolute(lc->restart_stack, stack);
+        mem_assign_absolute(lc->restart_fn, (unsigned long) func);
+        mem_assign_absolute(lc->restart_data, (unsigned long) data);
+        mem_assign_absolute(lc->restart_source, source_cpu);
        asm volatile(
-                "0:     sigp    0,%0,6  # sigp restart to target cpu\n"
+                "0:     sigp    0,%0,%2 # sigp restart to target cpu\n"
                "       brc     2,0b    # busy, try again\n"
-                "1:     sigp    0,%1,5  # sigp stop to current cpu\n"
+                "1:     sigp    0,%1,%3 # sigp stop to current cpu\n"
                "       brc     2,1b    # busy, try again\n"
-                : : "d" (pcpu->address), "d" (restart.source) : "0", "1", "cc");
+                : : "d" (pcpu->address), "d" (source_cpu),
+                    "K" (SIGP_RESTART), "K" (SIGP_STOP)
+                : "0", "1", "cc");
        for (;;) ;
 }
@@ -388,8 +363,8 @@ void smp_emergency_stop(cpumask_t *cpumask)
        for_each_cpu(cpu, cpumask) {
                struct pcpu *pcpu = pcpu_devices + cpu;
                set_bit(ec_stop_cpu, &pcpu->ec_mask);
-                while (__pcpu_sigp(pcpu->address, sigp_emergency_signal,
+                while (__pcpu_sigp(pcpu->address, SIGP_EMERGENCY_SIGNAL,
-                                   0, NULL) == sigp_busy &&
+                                   0, NULL) == SIGP_CC_BUSY &&
                       get_clock() < end)
                        cpu_relax();
        }
@@ -425,7 +400,7 @@ void smp_send_stop(void)
        /* stop all processors */
        for_each_cpu(cpu, &cpumask) {
                struct pcpu *pcpu = pcpu_devices + cpu;
-                pcpu_sigp_retry(pcpu, sigp_stop, 0);
+                pcpu_sigp_retry(pcpu, SIGP_STOP, 0);
                while (!pcpu_stopped(pcpu))
                        cpu_relax();
        }
@@ -436,7 +411,7 @@ void smp_send_stop(void)
 */
 void smp_stop_cpu(void)
 {
-        pcpu_sigp_retry(pcpu_devices + smp_processor_id(), sigp_stop, 0);
+        pcpu_sigp_retry(pcpu_devices + smp_processor_id(), SIGP_STOP, 0);
        for (;;) ;
 }
@@ -590,7 +565,7 @@ static void __init smp_get_save_area(int cpu, u16 address)
        }
 #endif
        /* Get the registers of a non-boot cpu. */
-        __pcpu_sigp_relax(address, sigp_stop_and_store_status, 0, NULL);
+        __pcpu_sigp_relax(address, SIGP_STOP_AND_STORE_STATUS, 0, NULL);
        memcpy_real(save_area, lc + SAVE_AREA_BASE, sizeof(*save_area));
 }
@@ -599,8 +574,8 @@ int smp_store_status(int cpu)
        struct pcpu *pcpu;
        pcpu = pcpu_devices + cpu;
-        if (__pcpu_sigp_relax(pcpu->address, sigp_stop_and_store_status,
+        if (__pcpu_sigp_relax(pcpu->address, SIGP_STOP_AND_STORE_STATUS,
-                              0, NULL) != sigp_order_code_accepted)
+                              0, NULL) != SIGP_CC_ORDER_CODE_ACCEPTED)
                return -EIO;
        return 0;
 }
@@ -621,8 +596,8 @@ static struct sclp_cpu_info *smp_get_cpu_info(void)
        if (info && (use_sigp_detection || sclp_get_cpu_info(info))) {
                use_sigp_detection = 1;
                for (address = 0; address <= MAX_CPU_ADDRESS; address++) {
-                        if (__pcpu_sigp_relax(address, sigp_sense, 0, NULL) ==
+                        if (__pcpu_sigp_relax(address, SIGP_SENSE, 0, NULL) ==
-                            sigp_not_operational)
+                            SIGP_CC_NOT_OPERATIONAL)
                                continue;
                        info->cpu[info->configured].address = address;
                        info->configured++;
@@ -717,9 +692,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
        init_cpu_vtimer();
        pfault_init();
        notify_cpu_starting(smp_processor_id());
-        ipi_call_lock();
        set_cpu_online(smp_processor_id(), true);
-        ipi_call_unlock();
        local_irq_enable();
        /* cpu_idle will call schedule for us */
        cpu_idle();
@@ -734,8 +707,8 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
        pcpu = pcpu_devices + cpu;
        if (pcpu->state != CPU_STATE_CONFIGURED)
                return -EIO;
-        if (pcpu_sigp_retry(pcpu, sigp_initial_cpu_reset, 0) !=
+        if (pcpu_sigp_retry(pcpu, SIGP_INITIAL_CPU_RESET, 0) !=
-            sigp_order_code_accepted)
+            SIGP_CC_ORDER_CODE_ACCEPTED)
                return -EIO;
        rc = pcpu_alloc_lowcore(pcpu, cpu);
@@ -795,7 +768,7 @@ void __cpu_die(unsigned int cpu)
 void __noreturn cpu_die(void)
 {
        idle_task_exit();
-        pcpu_sigp_retry(pcpu_devices + smp_processor_id(), sigp_stop, 0);
+        pcpu_sigp_retry(pcpu_devices + smp_processor_id(), SIGP_STOP, 0);
        for (;;) ;
 }
@@ -942,7 +915,7 @@ static ssize_t show_idle_count(struct device *dev,
        do {
                sequence = ACCESS_ONCE(idle->sequence);
                idle_count = ACCESS_ONCE(idle->idle_count);
-                if (ACCESS_ONCE(idle->idle_enter))
+                if (ACCESS_ONCE(idle->clock_idle_enter))
                        idle_count++;
        } while ((sequence & 1) || (idle->sequence != sequence));
        return sprintf(buf, "%llu\n", idle_count);
@@ -960,8 +933,8 @@ static ssize_t show_idle_time(struct device *dev,
                now = get_clock();
                sequence = ACCESS_ONCE(idle->sequence);
                idle_time = ACCESS_ONCE(idle->idle_time);
-                idle_enter = ACCESS_ONCE(idle->idle_enter);
+                idle_enter = ACCESS_ONCE(idle->clock_idle_enter);
-                idle_exit = ACCESS_ONCE(idle->idle_exit);
+                idle_exit = ACCESS_ONCE(idle->clock_idle_exit);
        } while ((sequence & 1) || (idle->sequence != sequence));
        idle_time += idle_enter ? ((idle_exit ? : now) - idle_enter) : 0;
        return sprintf(buf, "%llu\n", idle_time >> 12);
@@ -984,14 +957,11 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
        unsigned int cpu = (unsigned int)(long)hcpu;
        struct cpu *c = &pcpu_devices[cpu].cpu;
        struct device *s = &c->dev;
-        struct s390_idle_data *idle;
        int err = 0;
        switch (action) {
        case CPU_ONLINE:
        case CPU_ONLINE_FROZEN:
-                idle = &per_cpu(s390_idle, cpu);
-                memset(idle, 0, sizeof(struct s390_idle_data));
                err = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
                break;
        case CPU_DEAD:
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c
index 8841919ef7e6..1785cd82253c 100644
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@ -1,9 +1,7 @@
 /*
- * arch/s390/kernel/stacktrace.c
- *
 * Stack trace management functions
 *
- *  Copyright (C) IBM Corp. 2006
+ *  Copyright IBM Corp. 2006
 *  Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 */
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index dd70ef046058..d4ca4e0617b5 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -12,6 +12,7 @@
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
+#include <asm/sigp.h>
 /*
 * Save register context in absolute 0 lowcore and call swsusp_save() to
@@ -163,7 +164,7 @@ ENTRY(swsusp_arch_resume)
        diag    %r0,%r0,0x308
 restart_entry:
        lhi     %r1,1
-        sigp    %r1,%r0,0x12
+        sigp    %r1,%r0,SIGP_SET_ARCHITECTURE
        sam64
        larl    %r1,.Lnew_pgm_check_psw
        lpswe   0(%r1)
@@ -179,7 +180,7 @@ pgm_check_entry:
        larl    %r4,.Lrestart_suspend_psw       /* Set new restart PSW */
        mvc     __LC_RST_NEW_PSW(16,%r0),0(%r4)
 3:
-        sigp    %r9,%r1,11                      /* sigp initial cpu reset */
+        sigp    %r9,%r1,SIGP_INITIAL_CPU_RESET  /* sigp initial cpu reset */
        brc     8,4f                            /* accepted */
        brc     2,3b                            /* busy, try again */
@@ -190,16 +191,16 @@ pgm_check_entry:
        larl    %r3,_sclp_print_early
        lghi    %r1,0
        sam31
-        sigp    %r1,%r0,0x12
+        sigp    %r1,%r0,SIGP_SET_ARCHITECTURE
        basr    %r14,%r3
        larl    %r3,.Ldisabled_wait_31
        lpsw    0(%r3)
 4:
        /* Switch to suspend CPU */
-        sigp    %r9,%r1,6               /* sigp restart to suspend CPU */
+        sigp    %r9,%r1,SIGP_RESTART    /* sigp restart to suspend CPU */
        brc     2,4b                    /* busy, try again */
 5:
-        sigp    %r9,%r2,5               /* sigp stop to current resume CPU */
+        sigp    %r9,%r2,SIGP_STOP       /* sigp stop to current resume CPU */
        brc     2,5b                    /* busy, try again */
 6:      j       6b
@@ -207,7 +208,7 @@ restart_suspend:
        larl    %r1,.Lresume_cpu
        llgh    %r2,0(%r1)
 7:
-        sigp    %r9,%r2,1               /* sigp sense, wait for resume CPU */
+        sigp    %r9,%r2,SIGP_SENSE      /* sigp sense, wait for resume CPU */
        brc     8,7b                    /* accepted, status 0, still running */
        brc     2,7b                    /* busy, try again */
        tmll    %r9,0x40                /* Test if resume CPU is stopped */
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 78ea1948ff51..b4a29eee41b8 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/kernel/sys_s390.c
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Thomas Spatzier (tspat@de.ibm.com)
 *
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index d4e1cb1dbcd1..dcec960fc724 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -1,5 +1,4 @@
 /*
- *  arch/s390/kernel/time.c
 *    Time of day based timer functions.
 *
 *  S390 version
@@ -45,7 +44,7 @@
 #include <asm/vdso.h>
 #include <asm/irq.h>
 #include <asm/irq_regs.h>
-#include <asm/timer.h>
+#include <asm/vtimer.h>
 #include <asm/etr.h>
 #include <asm/cio.h>
 #include "entry.h"
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 4f8dc942257c..05151e06c388 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2007,2011
+ *    Copyright IBM Corp. 2007, 2011
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 */
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 77cdf4234ebc..af2421a0f315 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/kernel/traps.c
- *
 *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2000
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
 *
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 39ebff506946..4fc97b40a6e1 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -1,71 +1,82 @@
 /*
- *  arch/s390/kernel/vtime.c
 *    Virtual cpu timer based timer functions.
 *
- *  S390 version
+ *    Copyright IBM Corp. 2004, 2012
- *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
 *    Author(s): Jan Glauber <jan.glauber@de.ibm.com>
 */
-#include <linux/module.h>
+#include <linux/kernel_stat.h>
+#include <linux/notifier.h>
+#include <linux/kprobes.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/types.h>
 #include <linux/timex.h>
-#include <linux/notifier.h>
+#include <linux/types.h>
-#include <linux/kernel_stat.h>
+#include <linux/time.h>
-#include <linux/rcupdate.h>
-#include <linux/posix-timers.h>
 #include <linux/cpu.h>
-#include <linux/kprobes.h>
+#include <linux/smp.h>
-#include <asm/timer.h>
 #include <asm/irq_regs.h>
 #include <asm/cputime.h>
+#include <asm/vtimer.h>
 #include <asm/irq.h>
 #include "entry.h"
-static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
+static void virt_timer_expire(void);
 DEFINE_PER_CPU(struct s390_idle_data, s390_idle);
-static inline __u64 get_vtimer(void)
+static LIST_HEAD(virt_timer_list);
+static DEFINE_SPINLOCK(virt_timer_lock);
+static atomic64_t virt_timer_current;
+static atomic64_t virt_timer_elapsed;
+static inline u64 get_vtimer(void)
 {
-        __u64 timer;
+        u64 timer;
-        asm volatile("STPT %0" : "=m" (timer));
+        asm volatile("stpt %0" : "=m" (timer));
        return timer;
 }
-static inline void set_vtimer(__u64 expires)
+static inline void set_vtimer(u64 expires)
 {
-        __u64 timer;
+        u64 timer;
-        asm volatile ("  STPT %0\n"  /* Store current cpu timer value */
+        asm volatile(
-                      "  SPT %1"     /* Set new value immediately afterwards */
+                "       stpt    %0\n"   /* Store current cpu timer value */
-                      : "=m" (timer) : "m" (expires) );
+                "       spt     %1"     /* Set new value imm. afterwards */
+                : "=m" (timer) : "m" (expires));
        S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer;
        S390_lowcore.last_update_timer = expires;
 }
+static inline int virt_timer_forward(u64 elapsed)
+{
+        BUG_ON(!irqs_disabled());
+        if (list_empty(&virt_timer_list))
+                return 0;
+        elapsed = atomic64_add_return(elapsed, &virt_timer_elapsed);
+        return elapsed >= atomic64_read(&virt_timer_current);
+}
 /*
 * Update process times based on virtual cpu times stored by entry.S
 * to the lowcore fields user_timer, system_timer & steal_clock.
 */
-static void do_account_vtime(struct task_struct *tsk, int hardirq_offset)
+static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)
 {
        struct thread_info *ti = task_thread_info(tsk);
-        __u64 timer, clock, user, system, steal;
+        u64 timer, clock, user, system, steal;
        timer = S390_lowcore.last_update_timer;
        clock = S390_lowcore.last_update_clock;
-        asm volatile ("  STPT %0\n"    /* Store current cpu timer value */
+        asm volatile(
-                      "  STCK %1"      /* Store current tod clock value */
+                "       stpt    %0\n"   /* Store current cpu timer value */
-                      : "=m" (S390_lowcore.last_update_timer),
+                "       stck    %1"     /* Store current tod clock value */
-                        "=m" (S390_lowcore.last_update_clock) );
+                : "=m" (S390_lowcore.last_update_timer),
+                  "=m" (S390_lowcore.last_update_clock));
        S390_lowcore.system_timer += timer - S390_lowcore.last_update_timer;
        S390_lowcore.steal_timer += S390_lowcore.last_update_clock - clock;
@@ -84,6 +95,8 @@ static void do_account_vtime(struct task_struct *tsk, int hardirq_offset)
                S390_lowcore.steal_timer = 0;
                account_steal_time(steal);
        }
+        return virt_timer_forward(user + system);
 }
 void account_vtime(struct task_struct *prev, struct task_struct *next)
@@ -101,7 +114,8 @@ void account_vtime(struct task_struct *prev, struct task_struct *next)
 void account_process_tick(struct task_struct *tsk, int user_tick)
 {
-        do_account_vtime(tsk, HARDIRQ_OFFSET);
+        if (do_account_vtime(tsk, HARDIRQ_OFFSET))
+                virt_timer_expire();
 }
 /*
@@ -111,7 +125,7 @@ void account_process_tick(struct task_struct *tsk, int user_tick)
 void account_system_vtime(struct task_struct *tsk)
 {
        struct thread_info *ti = task_thread_info(tsk);
-        __u64 timer, system;
+        u64 timer, system;
        timer = S390_lowcore.last_update_timer;
        S390_lowcore.last_update_timer = get_vtimer();
@@ -121,13 +135,14 @@ void account_system_vtime(struct task_struct *tsk)
        S390_lowcore.steal_timer -= system;
        ti->system_timer = S390_lowcore.system_timer;
        account_system_time(tsk, 0, system, system);
+        virt_timer_forward(system);
 }
 EXPORT_SYMBOL_GPL(account_system_vtime);
 void __kprobes vtime_stop_cpu(void)
 {
        struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
-        struct vtimer_queue *vq = &__get_cpu_var(virt_cpu_timer);
        unsigned long long idle_time;
        unsigned long psw_mask;
@@ -141,7 +156,7 @@ void __kprobes vtime_stop_cpu(void)
        idle->nohz_delay = 0;
        /* Call the assembler magic in entry.S */
-        psw_idle(idle, vq, psw_mask, !list_empty(&vq->list));
+        psw_idle(idle, psw_mask);
        /* Reenable preemption tracer. */
        start_critical_timings();
@@ -149,9 +164,9 @@ void __kprobes vtime_stop_cpu(void)
        /* Account time spent with enabled wait psw loaded as idle time. */
        idle->sequence++;
        smp_wmb();
-        idle_time = idle->idle_exit - idle->idle_enter;
+        idle_time = idle->clock_idle_exit - idle->clock_idle_enter;
+        idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
        idle->idle_time += idle_time;
-        idle->idle_enter = idle->idle_exit = 0ULL;
        idle->idle_count++;
        account_idle_time(idle_time);
        smp_wmb();
@@ -167,10 +182,10 @@ cputime64_t s390_get_idle_time(int cpu)
        do {
                now = get_clock();
                sequence = ACCESS_ONCE(idle->sequence);
-                idle_enter = ACCESS_ONCE(idle->idle_enter);
+                idle_enter = ACCESS_ONCE(idle->clock_idle_enter);
-                idle_exit = ACCESS_ONCE(idle->idle_exit);
+                idle_exit = ACCESS_ONCE(idle->clock_idle_exit);
        } while ((sequence & 1) || (idle->sequence != sequence));
-        return idle_enter ? ((idle_exit ? : now) - idle_enter) : 0;
+        return idle_enter ? ((idle_exit ?: now) - idle_enter) : 0;
 }
 /*
@@ -179,11 +194,11 @@ cputime64_t s390_get_idle_time(int cpu)
 */
 static void list_add_sorted(struct vtimer_list *timer, struct list_head *head)
 {
-        struct vtimer_list *event;
+        struct vtimer_list *tmp;
-        list_for_each_entry(event, head, entry) {
+        list_for_each_entry(tmp, head, entry) {
-                if (event->expires > timer->expires) {
+                if (tmp->expires > timer->expires) {
-                        list_add_tail(&timer->entry, &event->entry);
+                        list_add_tail(&timer->entry, &tmp->entry);
                        return;
                }
        }
@@ -191,82 +206,45 @@ static void list_add_sorted(struct vtimer_list *timer, struct list_head *head)
 }
 /*
- * Do the callback functions of expired vtimer events.
+ * Handler for expired virtual CPU timer.
- * Called from within the interrupt handler.
- */
-static void do_callbacks(struct list_head *cb_list)
-{
-        struct vtimer_queue *vq;
-        struct vtimer_list *event, *tmp;
-        if (list_empty(cb_list))
-                return;
-        vq = &__get_cpu_var(virt_cpu_timer);
-        list_for_each_entry_safe(event, tmp, cb_list, entry) {
-                list_del_init(&event->entry);
-                (event->function)(event->data);
-                if (event->interval) {
-                        /* Recharge interval timer */
-                        event->expires = event->interval + vq->elapsed;
-                        spin_lock(&vq->lock);
-                        list_add_sorted(event, &vq->list);
-                        spin_unlock(&vq->lock);
-                }
-        }
-}
-/*
- * Handler for the virtual CPU timer.
 */
-static void do_cpu_timer_interrupt(struct ext_code ext_code,
+static void virt_timer_expire(void)
-                                   unsigned int param32, unsigned long param64)
 {
-        struct vtimer_queue *vq;
+        struct vtimer_list *timer, *tmp;
-        struct vtimer_list *event, *tmp;
+        unsigned long elapsed;
-        struct list_head cb_list;       /* the callback queue */
+        LIST_HEAD(cb_list);
-        __u64 elapsed, next;
+        /* walk timer list, fire all expired timers */
-        kstat_cpu(smp_processor_id()).irqs[EXTINT_TMR]++;
+        spin_lock(&virt_timer_lock);
-        INIT_LIST_HEAD(&cb_list);
+        elapsed = atomic64_read(&virt_timer_elapsed);
-        vq = &__get_cpu_var(virt_cpu_timer);
+        list_for_each_entry_safe(timer, tmp, &virt_timer_list, entry) {
+                if (timer->expires < elapsed)
-        /* walk timer list, fire all expired events */
-        spin_lock(&vq->lock);
-        elapsed = vq->elapsed + (vq->timer - S390_lowcore.async_enter_timer);
-        BUG_ON((s64) elapsed < 0);
-        vq->elapsed = 0;
-        list_for_each_entry_safe(event, tmp, &vq->list, entry) {
-                if (event->expires < elapsed)
                        /* move expired timer to the callback queue */
-                        list_move_tail(&event->entry, &cb_list);
+                        list_move_tail(&timer->entry, &cb_list);
                else
-                        event->expires -= elapsed;
+                        timer->expires -= elapsed;
        }
-        spin_unlock(&vq->lock);
+        if (!list_empty(&virt_timer_list)) {
+                timer = list_first_entry(&virt_timer_list,
-        do_callbacks(&cb_list);
+                                         struct vtimer_list, entry);
+                atomic64_set(&virt_timer_current, timer->expires);
-        /* next event is first in list */
+        }
-        next = VTIMER_MAX_SLICE;
+        atomic64_sub(elapsed, &virt_timer_elapsed);
-        spin_lock(&vq->lock);
+        spin_unlock(&virt_timer_lock);
-        if (!list_empty(&vq->list)) {
-                event = list_first_entry(&vq->list, struct vtimer_list, entry);
+        /* Do callbacks and recharge periodic timers */
-                next = event->expires;
+        list_for_each_entry_safe(timer, tmp, &cb_list, entry) {
+                list_del_init(&timer->entry);
+                timer->function(timer->data);
+                if (timer->interval) {
+                        /* Recharge interval timer */
+                        timer->expires = timer->interval +
+                                atomic64_read(&virt_timer_elapsed);
+                        spin_lock(&virt_timer_lock);
+                        list_add_sorted(timer, &virt_timer_list);
+                        spin_unlock(&virt_timer_lock);
+                }
        }
-        spin_unlock(&vq->lock);
-        /*
-         * To improve precision add the time spent by the
-         * interrupt handler to the elapsed time.
-         * Note: CPU timer counts down and we got an interrupt,
-         *       the current content is negative
-         */
-        elapsed = S390_lowcore.async_enter_timer - get_vtimer();
-        set_vtimer(next - elapsed);
-        vq->timer = next - elapsed;
-        vq->elapsed = elapsed;
 }
 void init_virt_timer(struct vtimer_list *timer)
@@ -278,179 +256,108 @@ EXPORT_SYMBOL(init_virt_timer);
 static inline int vtimer_pending(struct vtimer_list *timer)
 {
-        return (!list_empty(&timer->entry));
+        return !list_empty(&timer->entry);
 }
-/*
- * this function should only run on the specified CPU
- */
 static void internal_add_vtimer(struct vtimer_list *timer)
 {
-        struct vtimer_queue *vq;
+        if (list_empty(&virt_timer_list)) {
-        unsigned long flags;
+                /* First timer, just program it. */
-        __u64 left, expires;
+                atomic64_set(&virt_timer_current, timer->expires);
+                atomic64_set(&virt_timer_elapsed, 0);
-        vq = &per_cpu(virt_cpu_timer, timer->cpu);
+                list_add(&timer->entry, &virt_timer_list);
-        spin_lock_irqsave(&vq->lock, flags);
-        BUG_ON(timer->cpu != smp_processor_id());
-        if (list_empty(&vq->list)) {
-                /* First timer on this cpu, just program it. */
-                list_add(&timer->entry, &vq->list);
-                set_vtimer(timer->expires);
-                vq->timer = timer->expires;
-                vq->elapsed = 0;
        } else {
-                /* Check progress of old timers. */
+                /* Update timer against current base. */
-                expires = timer->expires;
+                timer->expires += atomic64_read(&virt_timer_elapsed);
-                left = get_vtimer();
+                if (likely((s64) timer->expires <
-                if (likely((s64) expires < (s64) left)) {
+                           (s64) atomic64_read(&virt_timer_current)))
                        /* The new timer expires before the current timer. */
-                        set_vtimer(expires);
+                        atomic64_set(&virt_timer_current, timer->expires);
-                        vq->elapsed += vq->timer - left;
+                /* Insert new timer into the list. */
-                        vq->timer = expires;
+                list_add_sorted(timer, &virt_timer_list);
-                } else {
-                        vq->elapsed += vq->timer - left;
-                        vq->timer = left;
-                }
-                /* Insert new timer into per cpu list. */
-                timer->expires += vq->elapsed;
-                list_add_sorted(timer, &vq->list);
        }
-        spin_unlock_irqrestore(&vq->lock, flags);
-        /* release CPU acquired in prepare_vtimer or mod_virt_timer() */
-        put_cpu();
 }
-static inline void prepare_vtimer(struct vtimer_list *timer)
+static void __add_vtimer(struct vtimer_list *timer, int periodic)
 {
-        BUG_ON(!timer->function);
+        unsigned long flags;
-        BUG_ON(!timer->expires || timer->expires > VTIMER_MAX_SLICE);
-        BUG_ON(vtimer_pending(timer));
+        timer->interval = periodic ? timer->expires : 0;
-        timer->cpu = get_cpu();
+        spin_lock_irqsave(&virt_timer_lock, flags);
+        internal_add_vtimer(timer);
+        spin_unlock_irqrestore(&virt_timer_lock, flags);
 }
 /*
 * add_virt_timer - add an oneshot virtual CPU timer
 */
-void add_virt_timer(void *new)
+void add_virt_timer(struct vtimer_list *timer)
 {
-        struct vtimer_list *timer;
+        __add_vtimer(timer, 0);
-        timer = (struct vtimer_list *)new;
-        prepare_vtimer(timer);
-        timer->interval = 0;
-        internal_add_vtimer(timer);
 }
 EXPORT_SYMBOL(add_virt_timer);
 /*
 * add_virt_timer_int - add an interval virtual CPU timer
 */
-void add_virt_timer_periodic(void *new)
+void add_virt_timer_periodic(struct vtimer_list *timer)
 {
-        struct vtimer_list *timer;
+        __add_vtimer(timer, 1);
-        timer = (struct vtimer_list *)new;
-        prepare_vtimer(timer);
-        timer->interval = timer->expires;
-        internal_add_vtimer(timer);
 }
 EXPORT_SYMBOL(add_virt_timer_periodic);
-static int __mod_vtimer(struct vtimer_list *timer, __u64 expires, int periodic)
+static int __mod_vtimer(struct vtimer_list *timer, u64 expires, int periodic)
 {
-        struct vtimer_queue *vq;
        unsigned long flags;
-        int cpu;
+        int rc;
        BUG_ON(!timer->function);
-        BUG_ON(!expires || expires > VTIMER_MAX_SLICE);
        if (timer->expires == expires && vtimer_pending(timer))
                return 1;
+        spin_lock_irqsave(&virt_timer_lock, flags);
-        cpu = get_cpu();
+        rc = vtimer_pending(timer);
-        vq = &per_cpu(virt_cpu_timer, cpu);
+        if (rc)
+                list_del_init(&timer->entry);
-        /* disable interrupts before test if timer is pending */
+        timer->interval = periodic ? expires : 0;
-        spin_lock_irqsave(&vq->lock, flags);
-        /* if timer isn't pending add it on the current CPU */
-        if (!vtimer_pending(timer)) {
-                spin_unlock_irqrestore(&vq->lock, flags);
-                if (periodic)
-                        timer->interval = expires;
-                else
-                        timer->interval = 0;
-                timer->expires = expires;
-                timer->cpu = cpu;
-                internal_add_vtimer(timer);
-                return 0;
-        }
-        /* check if we run on the right CPU */
-        BUG_ON(timer->cpu != cpu);
-        list_del_init(&timer->entry);
        timer->expires = expires;
-        if (periodic)
-                timer->interval = expires;
-        /* the timer can't expire anymore so we can release the lock */
-        spin_unlock_irqrestore(&vq->lock, flags);
        internal_add_vtimer(timer);
-        return 1;
+        spin_unlock_irqrestore(&virt_timer_lock, flags);
+        return rc;
 }
 /*
- * If we change a pending timer the function must be called on the CPU
- * where the timer is running on.
- *
 * returns whether it has modified a pending timer (1) or not (0)
 */
-int mod_virt_timer(struct vtimer_list *timer, __u64 expires)
+int mod_virt_timer(struct vtimer_list *timer, u64 expires)
 {
        return __mod_vtimer(timer, expires, 0);
 }
 EXPORT_SYMBOL(mod_virt_timer);
 /*
- * If we change a pending timer the function must be called on the CPU
- * where the timer is running on.
- *
 * returns whether it has modified a pending timer (1) or not (0)
 */
-int mod_virt_timer_periodic(struct vtimer_list *timer, __u64 expires)
+int mod_virt_timer_periodic(struct vtimer_list *timer, u64 expires)
 {
        return __mod_vtimer(timer, expires, 1);
 }
 EXPORT_SYMBOL(mod_virt_timer_periodic);
 /*
- * delete a virtual timer
+ * Delete a virtual timer.
 *
 * returns whether the deleted timer was pending (1) or not (0)
 */
 int del_virt_timer(struct vtimer_list *timer)
 {
        unsigned long flags;
-        struct vtimer_queue *vq;
-        /* check if timer is pending */
        if (!vtimer_pending(timer))
                return 0;
+        spin_lock_irqsave(&virt_timer_lock, flags);
-        vq = &per_cpu(virt_cpu_timer, timer->cpu);
-        spin_lock_irqsave(&vq->lock, flags);
-        /* we don't interrupt a running timer, just let it expire! */
        list_del_init(&timer->entry);
+        spin_unlock_irqrestore(&virt_timer_lock, flags);
-        spin_unlock_irqrestore(&vq->lock, flags);
        return 1;
 }
 EXPORT_SYMBOL(del_virt_timer);
@@ -458,20 +365,10 @@ EXPORT_SYMBOL(del_virt_timer);
 /*
 * Start the virtual CPU timer on the current CPU.
 */
-void init_cpu_vtimer(void)
+void __cpuinit init_cpu_vtimer(void)
 {
-        struct vtimer_queue *vq;
-        /* initialize per cpu vtimer structure */
-        vq = &__get_cpu_var(virt_cpu_timer);
-        INIT_LIST_HEAD(&vq->list);
-        spin_lock_init(&vq->lock);
-        /* enable cpu timer interrupts */
-        __ctl_set_bit(0,10);
        /* set initial cpu timer */
-        set_vtimer(0x7fffffffffffffffULL);
+        set_vtimer(VTIMER_MAX_SLICE);
 }
 static int __cpuinit s390_nohz_notify(struct notifier_block *self,
@@ -493,12 +390,7 @@ static int __cpuinit s390_nohz_notify(struct notifier_block *self,
 void __init vtime_init(void)
 {
-        /* request the cpu timer external interrupt */
-        if (register_external_interrupt(0x1005, do_cpu_timer_interrupt))
-                panic("Couldn't request external interrupt 0x1005");
        /* Enable cpu timer interrupts on the boot cpu. */
        init_cpu_vtimer();
        cpu_notifier(s390_nohz_notify, 0);
 }
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index b23d9ac77dfc..c88bb7793390 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -1,7 +1,7 @@
 /*
- * diag.c - handling diagnose instructions
+ * handling diagnose instructions
 *
- * Copyright IBM Corp. 2008,2011
+ * Copyright IBM Corp. 2008, 2011
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
index c86f6ae43f76..4703f129e95e 100644
--- a/arch/s390/kvm/gaccess.h
+++ b/arch/s390/kvm/gaccess.h
@@ -1,7 +1,7 @@
 /*
- * access.h -  access guest memory
+ * access guest memory
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 979cbe55bf5e..adae539f12e2 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -1,7 +1,7 @@
 /*
- * intercept.c - in-kernel handling for sie intercepts
+ * in-kernel handling for sie intercepts
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 2d9f9a72bb81..b7bc1aac8ed2 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1,5 +1,5 @@
 /*
- * interrupt.c - handling kvm guest interrupts
+ * handling kvm guest interrupts
 *
 * Copyright IBM Corp. 2008
 *
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 664766d0c83c..d470ccbfabae 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1,7 +1,7 @@
 /*
- * s390host.c --  hosting zSeries kernel virtual machines
+ * hosting zSeries kernel virtual machines
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
@@ -347,6 +347,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu)
        vcpu->arch.guest_fpregs.fpc = 0;
        asm volatile("lfpc %0" : : "Q" (vcpu->arch.guest_fpregs.fpc));
        vcpu->arch.sie_block->gbea = 1;
+        atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
 }
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index 2294377975e8..d75bc5e92c5b 100644
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -1,7 +1,7 @@
 /*
- * kvm_s390.h -  definition for kvm on s390
+ * definition for kvm on s390
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 68a6b2ed16bf..60da903d6f3e 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -1,5 +1,5 @@
 /*
- * priv.c - handling privileged instructions
+ * handling privileged instructions
 *
 * Copyright IBM Corp. 2008
 *
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index 0ad4cf238391..56f80e1f98f7 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -1,7 +1,7 @@
 /*
- * sigp.c - handlinge interprocessor communication
+ * handling interprocessor communication
 *
- * Copyright IBM Corp. 2008,2009
+ * Copyright IBM Corp. 2008, 2009
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License (version 2 only)
@@ -15,38 +15,10 @@
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
 #include <linux/slab.h>
+#include <asm/sigp.h>
 #include "gaccess.h"
 #include "kvm-s390.h"
-/* sigp order codes */
-#define SIGP_SENSE             0x01
-#define SIGP_EXTERNAL_CALL     0x02
-#define SIGP_EMERGENCY         0x03
-#define SIGP_START             0x04
-#define SIGP_STOP              0x05
-#define SIGP_RESTART           0x06
-#define SIGP_STOP_STORE_STATUS 0x09
-#define SIGP_INITIAL_CPU_RESET 0x0b
-#define SIGP_CPU_RESET         0x0c
-#define SIGP_SET_PREFIX        0x0d
-#define SIGP_STORE_STATUS_ADDR 0x0e
-#define SIGP_SET_ARCH          0x12
-#define SIGP_SENSE_RUNNING     0x15
-/* cpu status bits */
-#define SIGP_STAT_EQUIPMENT_CHECK   0x80000000UL
-#define SIGP_STAT_NOT_RUNNING       0x00000400UL
-#define SIGP_STAT_INCORRECT_STATE   0x00000200UL
-#define SIGP_STAT_INVALID_PARAMETER 0x00000100UL
-#define SIGP_STAT_EXT_CALL_PENDING  0x00000080UL
-#define SIGP_STAT_STOPPED           0x00000040UL
-#define SIGP_STAT_OPERATOR_INTERV   0x00000020UL
-#define SIGP_STAT_CHECK_STOP        0x00000010UL
-#define SIGP_STAT_INOPERATIVE       0x00000004UL
-#define SIGP_STAT_INVALID_ORDER     0x00000002UL
-#define SIGP_STAT_RECEIVER_CHECK    0x00000001UL
 static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,
                        u64 *reg)
 {
@@ -54,19 +26,23 @@ static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,
        int rc;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        spin_lock(&fi->lock);
        if (fi->local_int[cpu_addr] == NULL)
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
        else if (!(atomic_read(fi->local_int[cpu_addr]->cpuflags)
-                  & CPUSTAT_STOPPED)) {
+                   & (CPUSTAT_ECALL_PEND | CPUSTAT_STOPPED)))
-                *reg &= 0xffffffff00000000UL;
+                rc = SIGP_CC_ORDER_CODE_ACCEPTED;
-                rc = 1; /* status stored */
+        else {
-        } else {
                *reg &= 0xffffffff00000000UL;
-                *reg |= SIGP_STAT_STOPPED;
+                if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
-                rc = 1; /* status stored */
+                    & CPUSTAT_ECALL_PEND)
+                        *reg |= SIGP_STATUS_EXT_CALL_PENDING;
+                if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
+                    & CPUSTAT_STOPPED)
+                        *reg |= SIGP_STATUS_STOPPED;
+                rc = SIGP_CC_STATUS_STORED;
        }
        spin_unlock(&fi->lock);
@@ -82,7 +58,7 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr)
        int rc;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        inti = kzalloc(sizeof(*inti), GFP_KERNEL);
        if (!inti)
@@ -94,7 +70,7 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr)
        spin_lock(&fi->lock);
        li = fi->local_int[cpu_addr];
        if (li == NULL) {
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
                kfree(inti);
                goto unlock;
        }
@@ -105,7 +81,7 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr)
        if (waitqueue_active(&li->wq))
                wake_up_interruptible(&li->wq);
        spin_unlock_bh(&li->lock);
-        rc = 0; /* order accepted */
+        rc = SIGP_CC_ORDER_CODE_ACCEPTED;
        VCPU_EVENT(vcpu, 4, "sent sigp emerg to cpu %x", cpu_addr);
 unlock:
        spin_unlock(&fi->lock);
@@ -120,7 +96,7 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr)
        int rc;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        inti = kzalloc(sizeof(*inti), GFP_KERNEL);
        if (!inti)
@@ -132,7 +108,7 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr)
        spin_lock(&fi->lock);
        li = fi->local_int[cpu_addr];
        if (li == NULL) {
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
                kfree(inti);
                goto unlock;
        }
@@ -143,7 +119,7 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr)
        if (waitqueue_active(&li->wq))
                wake_up_interruptible(&li->wq);
        spin_unlock_bh(&li->lock);
-        rc = 0; /* order accepted */
+        rc = SIGP_CC_ORDER_CODE_ACCEPTED;
        VCPU_EVENT(vcpu, 4, "sent sigp ext call to cpu %x", cpu_addr);
 unlock:
        spin_unlock(&fi->lock);
@@ -171,7 +147,7 @@ static int __inject_sigp_stop(struct kvm_s390_local_interrupt *li, int action)
 out:
        spin_unlock_bh(&li->lock);
-        return 0; /* order accepted */
+        return SIGP_CC_ORDER_CODE_ACCEPTED;
 }
 static int __sigp_stop(struct kvm_vcpu *vcpu, u16 cpu_addr, int action)
@@ -181,12 +157,12 @@ static int __sigp_stop(struct kvm_vcpu *vcpu, u16 cpu_addr, int action)
        int rc;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        spin_lock(&fi->lock);
        li = fi->local_int[cpu_addr];
        if (li == NULL) {
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
                goto unlock;
        }
@@ -210,11 +186,11 @@ static int __sigp_set_arch(struct kvm_vcpu *vcpu, u32 parameter)
        switch (parameter & 0xff) {
        case 0:
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
                break;
        case 1:
        case 2:
-                rc = 0; /* order accepted */
+                rc = SIGP_CC_ORDER_CODE_ACCEPTED;
                break;
        default:
                rc = -EOPNOTSUPP;
@@ -235,21 +211,23 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
        address = address & 0x7fffe000u;
        if (copy_from_guest_absolute(vcpu, &tmp, address, 1) ||
           copy_from_guest_absolute(vcpu, &tmp, address + PAGE_SIZE, 1)) {
-                *reg |= SIGP_STAT_INVALID_PARAMETER;
+                *reg &= 0xffffffff00000000UL;
-                return 1; /* invalid parameter */
+                *reg |= SIGP_STATUS_INVALID_PARAMETER;
+                return SIGP_CC_STATUS_STORED;
        }
        inti = kzalloc(sizeof(*inti), GFP_KERNEL);
        if (!inti)
-                return 2; /* busy */
+                return SIGP_CC_BUSY;
        spin_lock(&fi->lock);
        if (cpu_addr < KVM_MAX_VCPUS)
                li = fi->local_int[cpu_addr];
        if (li == NULL) {
-                rc = 1; /* incorrect state */
+                *reg &= 0xffffffff00000000UL;
-                *reg &= SIGP_STAT_INCORRECT_STATE;
+                *reg |= SIGP_STATUS_INCORRECT_STATE;
+                rc = SIGP_CC_STATUS_STORED;
                kfree(inti);
                goto out_fi;
        }
@@ -257,8 +235,9 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
        spin_lock_bh(&li->lock);
        /* cpu must be in stopped state */
        if (!(atomic_read(li->cpuflags) & CPUSTAT_STOPPED)) {
-                rc = 1; /* incorrect state */
+                *reg &= 0xffffffff00000000UL;
-                *reg &= SIGP_STAT_INCORRECT_STATE;
+                *reg |= SIGP_STATUS_INCORRECT_STATE;
+                rc = SIGP_CC_STATUS_STORED;
                kfree(inti);
                goto out_li;
        }
@@ -270,7 +249,7 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
        atomic_set(&li->active, 1);
        if (waitqueue_active(&li->wq))
                wake_up_interruptible(&li->wq);
-        rc = 0; /* order accepted */
+        rc = SIGP_CC_ORDER_CODE_ACCEPTED;
        VCPU_EVENT(vcpu, 4, "set prefix of cpu %02x to %x", cpu_addr, address);
 out_li:
@@ -287,21 +266,21 @@ static int __sigp_sense_running(struct kvm_vcpu *vcpu, u16 cpu_addr,
        struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        spin_lock(&fi->lock);
        if (fi->local_int[cpu_addr] == NULL)
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
        else {
                if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
                    & CPUSTAT_RUNNING) {
                        /* running */
-                        rc = 1;
+                        rc = SIGP_CC_ORDER_CODE_ACCEPTED;
                } else {
                        /* not running */
                        *reg &= 0xffffffff00000000UL;
-                        *reg |= SIGP_STAT_NOT_RUNNING;
+                        *reg |= SIGP_STATUS_NOT_RUNNING;
-                        rc = 0;
+                        rc = SIGP_CC_STATUS_STORED;
                }
        }
        spin_unlock(&fi->lock);
@@ -314,23 +293,23 @@ static int __sigp_sense_running(struct kvm_vcpu *vcpu, u16 cpu_addr,
 static int __sigp_restart(struct kvm_vcpu *vcpu, u16 cpu_addr)
 {
-        int rc = 0;
        struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
        struct kvm_s390_local_interrupt *li;
+        int rc = SIGP_CC_ORDER_CODE_ACCEPTED;
        if (cpu_addr >= KVM_MAX_VCPUS)
-                return 3; /* not operational */
+                return SIGP_CC_NOT_OPERATIONAL;
        spin_lock(&fi->lock);
        li = fi->local_int[cpu_addr];
        if (li == NULL) {
-                rc = 3; /* not operational */
+                rc = SIGP_CC_NOT_OPERATIONAL;
                goto out;
        }
        spin_lock_bh(&li->lock);
        if (li->action_bits & ACTION_STOP_ON_STOP)
-                rc = 2; /* busy */
+                rc = SIGP_CC_BUSY;
        else
                VCPU_EVENT(vcpu, 4, "sigp restart %x to handle userspace",
                        cpu_addr);
@@ -375,7 +354,7 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
                vcpu->stat.instruction_sigp_external_call++;
                rc = __sigp_external_call(vcpu, cpu_addr);
                break;
-        case SIGP_EMERGENCY:
+        case SIGP_EMERGENCY_SIGNAL:
                vcpu->stat.instruction_sigp_emergency++;
                rc = __sigp_emergency(vcpu, cpu_addr);
                break;
@@ -383,12 +362,12 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
                vcpu->stat.instruction_sigp_stop++;
                rc = __sigp_stop(vcpu, cpu_addr, ACTION_STOP_ON_STOP);
                break;
-        case SIGP_STOP_STORE_STATUS:
+        case SIGP_STOP_AND_STORE_STATUS:
                vcpu->stat.instruction_sigp_stop++;
                rc = __sigp_stop(vcpu, cpu_addr, ACTION_STORE_ON_STOP |
                                                 ACTION_STOP_ON_STOP);
                break;
-        case SIGP_SET_ARCH:
+        case SIGP_SET_ARCHITECTURE:
                vcpu->stat.instruction_sigp_arch++;
                rc = __sigp_set_arch(vcpu, parameter);
                break;
@@ -405,7 +384,7 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
        case SIGP_RESTART:
                vcpu->stat.instruction_sigp_restart++;
                rc = __sigp_restart(vcpu, cpu_addr);
-                if (rc == 2) /* busy */
+                if (rc == SIGP_CC_BUSY)
                        break;
                /* user space must know about restart */
        default:
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 9f1f71e85778..42d0cf89121d 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -1,7 +1,7 @@
 /*
 *    Precise Delay Loops for S390
 *
- *    Copyright IBM Corp. 1999,2008
+ *    Copyright IBM Corp. 1999, 2008
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *               Heiko Carstens <heiko.carstens@de.ibm.com>,
 */
@@ -12,8 +12,8 @@
 #include <linux/module.h>
 #include <linux/irqflags.h>
 #include <linux/interrupt.h>
+#include <asm/vtimer.h>
 #include <asm/div64.h>
-#include <asm/timer.h>
 void __delay(unsigned long loops)
 {
diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c
index d9e62c0b576a..261152f83242 100644
--- a/arch/s390/lib/div64.c
+++ b/arch/s390/lib/div64.c
@@ -1,9 +1,7 @@
 /*
- *  arch/s390/lib/div64.c
- *
 *  __div64_32 implementation for 31 bit.
 *
- *    Copyright (C) IBM Corp. 2006
+ *    Copyright IBM Corp. 2006
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 */
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 093eb694d9c1..f709983f41f8 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/lib/spinlock.c
 *    Out of line spinlock code.
 *
- *    Copyright (C) IBM Corp. 2004, 2006
+ *    Copyright IBM Corp. 2004, 2006
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index 4143b7c19096..846ec64ab2c9 100644
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -1,9 +1,8 @@
 /*
- *  arch/s390/lib/string.c
 *    Optimized string functions
 *
 *  S390 version
- *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 2004
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
diff --git a/arch/s390/lib/uaccess.h b/arch/s390/lib/uaccess.h
index 1d2536cb630b..315dbe09983e 100644
--- a/arch/s390/lib/uaccess.h
+++ b/arch/s390/lib/uaccess.h
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/uaccess.h
- *
 *    Copyright IBM Corp. 2007
 *
 */
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c
index 58a75a8ae90c..2443ae476e33 100644
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
@@ -1,9 +1,7 @@
 /*
- *  arch/s390/lib/uaccess_mvcos.c
- *
 *  Optimized user space space access functions based on mvcos.
 *
- *    Copyright (C) IBM Corp. 2006
+ *    Copyright IBM Corp. 2006
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Gerald Schaefer (gerald.schaefer@de.ibm.com)
 */
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 342ae35a5ba9..60ee2b883797 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/lib/uaccess_pt.c
- *
 *  User access functions based on page table walks for enhanced
 *  system layout without hardware support.
 *
diff --git a/arch/s390/lib/uaccess_std.c b/arch/s390/lib/uaccess_std.c
index 57e94298539b..6fbd06338270 100644
--- a/arch/s390/lib/uaccess_std.c
+++ b/arch/s390/lib/uaccess_std.c
@@ -1,10 +1,8 @@
 /*
- *  arch/s390/lib/uaccess_std.c
- *
 *  Standard user space access functions based on mvcp/mvcs and doing
 *  interesting things in the secondary space mode.
 *
- *    Copyright (C) IBM Corp. 2006
+ *    Copyright IBM Corp. 2006
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Gerald Schaefer (gerald.schaefer@de.ibm.com)
 */
diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c
index cd4e9c168dd7..58bff541fde9 100644
--- a/arch/s390/math-emu/math.c
+++ b/arch/s390/math-emu/math.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/math-emu/math.c
- *
 *  S390 version
- *    Copyright (C) 1999-2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999, 2001
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *
 * 'math.c' emulates IEEE instructions on a S390 processor
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 1f1dba9dcf58..479e94282910 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -1,7 +1,7 @@
 /*
 *  Collaborative memory management interface.
 *
- *    Copyright IBM Corp 2003,2010
+ *    Copyright IBM Corp 2003, 2010
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
 *
 */
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 075ddada4911..519bba716cc3 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -1,10 +1,9 @@
 /*
- * File...........: arch/s390/mm/extmem.c
 * Author(s)......: Carsten Otte <cotte@de.ibm.com>
 *                  Rob M van der Heij <rvdheij@nl.ibm.com>
 *                  Steven Shultz <shultzss@us.ibm.com>
 * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation 2002-2004
+ * Copyright IBM Corp. 2002, 2004
 */
 #define KMSG_COMPONENT "extmem"
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 72cec9ecd96c..6a12d1bb6e09 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/mm/fault.c
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Hartmut Penner (hp@de.ibm.com)
 *               Ulrich Weigand (uweigand@de.ibm.com)
 *
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 900de2b3cf28..532525ec88c1 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -1,7 +1,7 @@
 /*
 *  IBM System z Huge TLB Page Support for Kernel.
 *
- *    Copyright 2007 IBM Corp.
+ *    Copyright IBM Corp. 2007
 *    Author(s): Gerald Schaefer <gerald.schaefer@de.ibm.com>
 */
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 2bea0605856e..6adbc082618a 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -1,8 +1,6 @@
 /*
- *  arch/s390/mm/init.c
- *
 *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999
 *    Author(s): Hartmut Penner (hp@de.ibm.com)
 *
 *  Derived from "arch/i386/mm/init.c"
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index 2857c48486ea..573384256c5c 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -1,6 +1,4 @@
 /*
- *  linux/arch/s390/mm/mmap.c
- *
 *  flexible mmap layout support
 *
 * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index a3db5a3ea083..1cab221077cc 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 2007,2011
+ *    Copyright IBM Corp. 2007, 2011
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
 */
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 71ae20df674e..6f896e75ab49 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -1,6 +1,4 @@
 /*
- *  arch/s390/mm/vmem.c
- *
 *    Copyright IBM Corp. 2006
 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
 */
diff --git a/arch/s390/oprofile/backtrace.c b/arch/s390/oprofile/backtrace.c
index bc4b84a35cad..c82f62fb9c28 100644
--- a/arch/s390/oprofile/backtrace.c
+++ b/arch/s390/oprofile/backtrace.c
@@ -1,8 +1,6 @@
-/**
+/*
- * arch/s390/oprofile/backtrace.c
- *
 * S390 Version
- *   Copyright (C) 2005 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ *   Copyright IBM Corp. 2005
 *   Author(s): Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
 */
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index a4a89fa980d6..0cb385da202c 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -1,6 +1,4 @@
-/**
+/*
- * arch/s390/oprofile/hwsampler.c
- *
 * Copyright IBM Corp. 2010
 * Author: Heinz Graalfs <graalfs@de.ibm.com>
 */
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 2297be406c61..a1e9d69a9c90 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -1,8 +1,6 @@
-/**
+/*
- * arch/s390/oprofile/init.c
- *
 * S390 Version
- *   Copyright (C) 2002-2011 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *   Copyright IBM Corp. 2002, 2011
 *   Author(s): Thomas Spatzier (tspat@de.ibm.com)
 *   Author(s): Mahesh Salgaonkar (mahesh@linux.vnet.ibm.com)
 *   Author(s): Heinz Graalfs (graalfs@linux.vnet.ibm.com)
diff --git a/arch/s390/oprofile/op_counter.h b/arch/s390/oprofile/op_counter.h
index 1a8d3ca09014..61b2531eef17 100644
--- a/arch/s390/oprofile/op_counter.h
+++ b/arch/s390/oprofile/op_counter.h
@@ -1,7 +1,5 @@
-/**
+/*
- * arch/s390/oprofile/op_counter.h
+ *   Copyright IBM Corp. 2011
- *
- *   Copyright (C) 2011 IBM Deutschland Entwicklung GmbH, IBM Corporation
 *   Author(s): Andreas Krebbel (krebbel@linux.vnet.ibm.com)
 *
 * @remark Copyright 2011 OProfile authors