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

Pull s390 patches from Martin Schwidefsky:
 "The biggest patch is the rework of the smp code, something I wanted to
  do for some time.  There are some patches for our various dump methods
  and one new thing: z/VM LGR detection.  LGR stands for linux-guest-
  relocation and is the guest migration feature of z/VM.  For debugging
  purposes we keep a log of the systems where a specific guest has lived."

Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
cleanup having removed some code next to removed s390 code.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
  [S390] Ensure that vmcore_info pointer is never accessed directly
  [S390] dasd: prevent validate server for offline devices
  [S390] Remove monolithic build option for zcrypt driver.
  [S390] stack dump: fix indentation in output
  [S390] kernel: Add OS info memory interface
  [S390] Use block_sigmask()
  [S390] kernel: Add z/VM LGR detection
  [S390] irq: external interrupt code passing
  [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
  [S390] zfcpdump: Implement async sdias event processing
  [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
  [S390] rework idle code
  [S390] rework smp code
  [S390] rename lowcore field
  [S390] Fix gcc 4.6.0 compile warning

12 files changed, 185 insertions, 240 deletions

diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index c23c3900c304..24ef186a1c4f 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -170,24 +170,17 @@ struct s390_idle_data {
         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;
 };
 
 DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
 
-void vtime_start_cpu(__u64 int_clock, __u64 enter_timer);
 cputime64_t s390_get_idle_time(int cpu);
 
 #define arch_idle_time(cpu) s390_get_idle_time(cpu)
 
-static inline void s390_idle_check(struct pt_regs *regs, __u64 int_clock,
-                                   __u64 enter_timer)
-{
-        if (regs->psw.mask & PSW_MASK_WAIT)
-                vtime_start_cpu(int_clock, enter_timer);
-}
-
 static inline int s390_nohz_delay(int cpu)
 {
         return __get_cpu_var(s390_idle).nohz_delay != 0;
diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h
index 9d88db1f55d0..8a8245ed14d2 100644
--- a/arch/s390/include/asm/debug.h
+++ b/arch/s390/include/asm/debug.h
@@ -131,6 +131,7 @@ void debug_unregister(debug_info_t* id);
 
 void debug_set_level(debug_info_t* id, int new_level);
 
+void debug_set_critical(void);
 void debug_stop_all(void);
 
 static inline debug_entry_t*
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index e4155d3eb2cb..510ba9ef4248 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -18,6 +18,7 @@
 
 #define __ARCH_IRQ_STAT
 #define __ARCH_HAS_DO_SOFTIRQ
+#define __ARCH_IRQ_EXIT_IRQS_DISABLED
 
 #define HARDIRQ_BITS    8
 
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index 6940abfbe1d9..2bd6cb897b90 100644
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
@@ -169,5 +169,6 @@ enum diag308_rc {
 extern int diag308(unsigned long subcode, void *addr);
 extern void diag308_reset(void);
 extern void store_status(void);
+extern void lgr_info_log(void);
 
 #endif /* _ASM_S390_IPL_H */
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index ba6d85f88d50..acee1806f61e 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -34,7 +34,12 @@ enum interruption_class {
         NR_IRQS,
 };
 
-typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);
+struct ext_code {
+        unsigned short subcode;
+        unsigned short code;
+};
+
+typedef void (*ext_int_handler_t)(struct ext_code, unsigned int, unsigned long);
 
 int register_external_interrupt(u16 code, ext_int_handler_t handler);
 int unregister_external_interrupt(u16 code, ext_int_handler_t handler);
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 707f2306725b..47853debb3b9 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 1999,2010
+ *    Copyright IBM Corp. 1999,2012
  *    Author(s): Hartmut Penner <hp@de.ibm.com>,
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
  *               Denis Joseph Barrow,
@@ -12,14 +12,6 @@
 #include <asm/ptrace.h>
 #include <asm/cpu.h>
 
-void restart_int_handler(void);
-void ext_int_handler(void);
-void system_call(void);
-void pgm_check_handler(void);
-void mcck_int_handler(void);
-void io_int_handler(void);
-void psw_restart_int_handler(void);
-
 #ifdef CONFIG_32BIT
 
 #define LC_ORDER 0
@@ -56,7 +48,7 @@ struct _lowcore {
         psw_t   mcck_new_psw;                   /* 0x0070 */
         psw_t   io_new_psw;                     /* 0x0078 */
         __u32   ext_params;                     /* 0x0080 */
-        __u16   cpu_addr;                       /* 0x0084 */
+        __u16   ext_cpu_addr;                   /* 0x0084 */
         __u16   ext_int_code;                   /* 0x0086 */
         __u16   svc_ilc;                        /* 0x0088 */
         __u16   svc_code;                       /* 0x008a */
@@ -117,32 +109,37 @@ struct _lowcore {
         __u64   steal_timer;                    /* 0x0288 */
         __u64   last_update_timer;              /* 0x0290 */
         __u64   last_update_clock;              /* 0x0298 */
+        __u64   int_clock;                      /* 0x02a0 */
+        __u64   mcck_clock;                     /* 0x02a8 */
+        __u64   clock_comparator;               /* 0x02b0 */
 
         /* Current process. */
-        __u32   current_task;                   /* 0x02a0 */
-        __u32   thread_info;                    /* 0x02a4 */
-        __u32   kernel_stack;                   /* 0x02a8 */
+        __u32   current_task;                   /* 0x02b8 */
+        __u32   thread_info;                    /* 0x02bc */
+        __u32   kernel_stack;                   /* 0x02c0 */
+
+        /* Interrupt, panic and restart stack. */
+        __u32   async_stack;                    /* 0x02c4 */
+        __u32   panic_stack;                    /* 0x02c8 */
+        __u32   restart_stack;                  /* 0x02cc */
 
-        /* Interrupt and panic stack. */
-        __u32   async_stack;                    /* 0x02ac */
-        __u32   panic_stack;                    /* 0x02b0 */
+        /* Restart function and parameter. */
+        __u32   restart_fn;                     /* 0x02d0 */
+        __u32   restart_data;                   /* 0x02d4 */
+        __u32   restart_source;                 /* 0x02d8 */
 
         /* Address space pointer. */
-        __u32   kernel_asce;                    /* 0x02b4 */
-        __u32   user_asce;                      /* 0x02b8 */
-        __u32   current_pid;                    /* 0x02bc */
+        __u32   kernel_asce;                    /* 0x02dc */
+        __u32   user_asce;                      /* 0x02e0 */
+        __u32   current_pid;                    /* 0x02e4 */
 
         /* SMP info area */
-        __u32   cpu_nr;                         /* 0x02c0 */
-        __u32   softirq_pending;                /* 0x02c4 */
-        __u32   percpu_offset;                  /* 0x02c8 */
-        __u32   ext_call_fast;                  /* 0x02cc */
-        __u64   int_clock;                      /* 0x02d0 */
-        __u64   mcck_clock;                     /* 0x02d8 */
-        __u64   clock_comparator;               /* 0x02e0 */
-        __u32   machine_flags;                  /* 0x02e8 */
-        __u32   ftrace_func;                    /* 0x02ec */
-        __u8    pad_0x02f8[0x0300-0x02f0];      /* 0x02f0 */
+        __u32   cpu_nr;                         /* 0x02e8 */
+        __u32   softirq_pending;                /* 0x02ec */
+        __u32   percpu_offset;                  /* 0x02f0 */
+        __u32   machine_flags;                  /* 0x02f4 */
+        __u32   ftrace_func;                    /* 0x02f8 */
+        __u8    pad_0x02fc[0x0300-0x02fc];      /* 0x02fc */
 
         /* Interrupt response block */
         __u8    irb[64];                        /* 0x0300 */
@@ -157,7 +154,9 @@ struct _lowcore {
         __u32   ipib;                           /* 0x0e00 */
         __u32   ipib_checksum;                  /* 0x0e04 */
         __u32   vmcore_info;                    /* 0x0e08 */
-        __u8    pad_0x0e0c[0x0f00-0x0e0c];      /* 0x0e0c */
+        __u8    pad_0x0e0c[0x0e18-0x0e0c];      /* 0x0e0c */
+        __u32   os_info;                        /* 0x0e18 */
+        __u8    pad_0x0e1c[0x0f00-0x0e1c];      /* 0x0e1c */
 
         /* Extended facility list */
         __u64   stfle_fac_list[32];             /* 0x0f00 */
@@ -189,7 +188,7 @@ struct _lowcore {
         __u32   ipl_parmblock_ptr;              /* 0x0014 */
         __u8    pad_0x0018[0x0080-0x0018];      /* 0x0018 */
         __u32   ext_params;                     /* 0x0080 */
-        __u16   cpu_addr;                       /* 0x0084 */
+        __u16   ext_cpu_addr;                   /* 0x0084 */
         __u16   ext_int_code;                   /* 0x0086 */
         __u16   svc_ilc;                        /* 0x0088 */
         __u16   svc_code;                       /* 0x008a */
@@ -254,34 +253,39 @@ struct _lowcore {
         __u64   steal_timer;                    /* 0x02e0 */
         __u64   last_update_timer;              /* 0x02e8 */
         __u64   last_update_clock;              /* 0x02f0 */
+        __u64   int_clock;                      /* 0x02f8 */
+        __u64   mcck_clock;                     /* 0x0300 */
+        __u64   clock_comparator;               /* 0x0308 */
 
         /* Current process. */
-        __u64   current_task;                   /* 0x02f8 */
-        __u64   thread_info;                    /* 0x0300 */
-        __u64   kernel_stack;                   /* 0x0308 */
+        __u64   current_task;                   /* 0x0310 */
+        __u64   thread_info;                    /* 0x0318 */
+        __u64   kernel_stack;                   /* 0x0320 */
+
+        /* Interrupt, panic and restart stack. */
+        __u64   async_stack;                    /* 0x0328 */
+        __u64   panic_stack;                    /* 0x0330 */
+        __u64   restart_stack;                  /* 0x0338 */
 
-        /* Interrupt and panic stack. */
-        __u64   async_stack;                    /* 0x0310 */
-        __u64   panic_stack;                    /* 0x0318 */
+        /* Restart function and parameter. */
+        __u64   restart_fn;                     /* 0x0340 */
+        __u64   restart_data;                   /* 0x0348 */
+        __u64   restart_source;                 /* 0x0350 */
 
         /* Address space pointer. */
-        __u64   kernel_asce;                    /* 0x0320 */
-        __u64   user_asce;                      /* 0x0328 */
-        __u64   current_pid;                    /* 0x0330 */
+        __u64   kernel_asce;                    /* 0x0358 */
+        __u64   user_asce;                      /* 0x0360 */
+        __u64   current_pid;                    /* 0x0368 */
 
         /* SMP info area */
-        __u32   cpu_nr;                         /* 0x0338 */
-        __u32   softirq_pending;                /* 0x033c */
-        __u64   percpu_offset;                  /* 0x0340 */
-        __u64   ext_call_fast;                  /* 0x0348 */
-        __u64   int_clock;                      /* 0x0350 */
-        __u64   mcck_clock;                     /* 0x0358 */
-        __u64   clock_comparator;               /* 0x0360 */
-        __u64   vdso_per_cpu_data;              /* 0x0368 */
-        __u64   machine_flags;                  /* 0x0370 */
-        __u64   ftrace_func;                    /* 0x0378 */
-        __u64   gmap;                           /* 0x0380 */
-        __u8    pad_0x0388[0x0400-0x0388];      /* 0x0388 */
+        __u32   cpu_nr;                         /* 0x0370 */
+        __u32   softirq_pending;                /* 0x0374 */
+        __u64   percpu_offset;                  /* 0x0378 */
+        __u64   vdso_per_cpu_data;              /* 0x0380 */
+        __u64   machine_flags;                  /* 0x0388 */
+        __u64   ftrace_func;                    /* 0x0390 */
+        __u64   gmap;                           /* 0x0398 */
+        __u8    pad_0x03a0[0x0400-0x03a0];      /* 0x03a0 */
 
         /* Interrupt response block. */
         __u8    irb[64];                        /* 0x0400 */
@@ -298,8 +302,15 @@ struct _lowcore {
          */
         __u64   ipib;                           /* 0x0e00 */
         __u32   ipib_checksum;                  /* 0x0e08 */
-        __u64   vmcore_info;                    /* 0x0e0c */
-        __u8    pad_0x0e14[0x0f00-0x0e14];      /* 0x0e14 */
+        /*
+         * 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 */
 
         /* Extended facility list */
         __u64   stfle_fac_list[32];             /* 0x0f00 */
diff --git a/arch/s390/include/asm/os_info.h b/arch/s390/include/asm/os_info.h
new file mode 100644
index 000000000000..d07518af09ea
--- /dev/null
+++ b/arch/s390/include/asm/os_info.h
@@ -0,0 +1,50 @@
+/*
+ * OS info memory interface
+ *
+ * Copyright IBM Corp. 2012
+ * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
+ */
+#ifndef _ASM_S390_OS_INFO_H
+#define _ASM_S390_OS_INFO_H
+
+#define OS_INFO_VERSION_MAJOR   1
+#define OS_INFO_VERSION_MINOR   1
+#define OS_INFO_MAGIC           0x4f53494e464f535aULL /* OSINFOSZ */
+
+#define OS_INFO_VMCOREINFO      0
+#define OS_INFO_REIPL_BLOCK     1
+#define OS_INFO_INIT_FN         2
+
+struct os_info_entry {
+        u64     addr;
+        u64     size;
+        u32     csum;
+} __packed;
+
+struct os_info {
+        u64     magic;
+        u32     csum;
+        u16     version_major;
+        u16     version_minor;
+        u64     crashkernel_addr;
+        u64     crashkernel_size;
+        struct os_info_entry entry[3];
+        u8      reserved[4004];
+} __packed;
+
+void os_info_init(void);
+void os_info_entry_add(int nr, void *ptr, u64 len);
+void os_info_crashkernel_add(unsigned long base, unsigned long size);
+u32 os_info_csum(struct os_info *os_info);
+
+#ifdef CONFIG_CRASH_DUMP
+void *os_info_old_entry(int nr, unsigned long *size);
+int copy_from_oldmem(void *dest, void *src, size_t count);
+#else
+static inline void *os_info_old_entry(int nr, unsigned long *size)
+{
+        return NULL;
+}
+#endif
+
+#endif /* _ASM_S390_OS_INFO_H */
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
deleted file mode 100644
index 7040b8567cd0..000000000000
--- a/arch/s390/include/asm/sigp.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Routines and structures for signalling other processors.
- *
- *    Copyright IBM Corp. 1999,2010
- *    Author(s): Denis Joseph Barrow,
- *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
- *               Heiko Carstens <heiko.carstens@de.ibm.com>,
- */
-
-#ifndef __ASM_SIGP_H
-#define __ASM_SIGP_H
-
-#include <asm/system.h>
-
-/* Get real cpu address from logical cpu number. */
-extern unsigned short __cpu_logical_map[];
-
-static inline int cpu_logical_map(int cpu)
-{
-#ifdef CONFIG_SMP
-        return __cpu_logical_map[cpu];
-#else
-        return stap();
-#endif
-}
-
-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,
-};
-
-/*
- * Definitions for external call.
- */
-enum {
-        ec_schedule = 0,
-        ec_call_function,
-        ec_call_function_single,
-        ec_stop_cpu,
-};
-
-/*
- * Signal processor.
- */
-static inline int raw_sigp(u16 cpu, int order)
-{
-        register unsigned long reg1 asm ("1") = 0;
-        int ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                :       "=d"    (ccode)
-                : "d" (reg1), "d" (cpu),
-                  "a" (order) : "cc" , "memory");
-        return ccode;
-}
-
-/*
- * Signal processor with parameter.
- */
-static inline int raw_sigp_p(u32 parameter, u16 cpu, int order)
-{
-        register unsigned int reg1 asm ("1") = parameter;
-        int ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode)
-                : "d" (reg1), "d" (cpu),
-                  "a" (order) : "cc" , "memory");
-        return ccode;
-}
-
-/*
- * Signal processor with parameter and return status.
- */
-static inline int raw_sigp_ps(u32 *status, u32 parm, u16 cpu, int order)
-{
-        register unsigned int reg1 asm ("1") = parm;
-        int ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode), "+d" (reg1)
-                : "d" (cpu), "a" (order)
-                : "cc" , "memory");
-        *status = reg1;
-        return ccode;
-}
-
-static inline int sigp(int cpu, int order)
-{
-        return raw_sigp(cpu_logical_map(cpu), order);
-}
-
-static inline int sigp_p(u32 parameter, int cpu, int order)
-{
-        return raw_sigp_p(parameter, cpu_logical_map(cpu), order);
-}
-
-static inline int sigp_ps(u32 *status, u32 parm, int cpu, int order)
-{
-        return raw_sigp_ps(status, parm, cpu_logical_map(cpu), order);
-}
-
-#endif /* __ASM_SIGP_H */
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index c32e9123b40c..797f78729680 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright IBM Corp. 1999,2009
+ *    Copyright IBM Corp. 1999,2012
  *    Author(s): Denis Joseph Barrow,
  *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
  *               Heiko Carstens <heiko.carstens@de.ibm.com>,
@@ -10,71 +10,52 @@
 #ifdef CONFIG_SMP
 
 #include <asm/system.h>
-#include <asm/sigp.h>
-
-extern void machine_restart_smp(char *);
-extern void machine_halt_smp(void);
-extern void machine_power_off_smp(void);
 
 #define raw_smp_processor_id()  (S390_lowcore.cpu_nr)
 
-extern int __cpu_disable (void);
-extern void __cpu_die (unsigned int cpu);
-extern int __cpu_up (unsigned int cpu);
-
 extern struct mutex smp_cpu_state_mutex;
+extern struct save_area *zfcpdump_save_areas[NR_CPUS + 1];
+
+extern int __cpu_up(unsigned int cpu);
 
 extern void arch_send_call_function_single_ipi(int cpu);
 extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 
-extern struct save_area *zfcpdump_save_areas[NR_CPUS + 1];
-
-extern void smp_switch_to_ipl_cpu(void (*func)(void *), void *);
-extern void smp_switch_to_cpu(void (*)(void *), void *, unsigned long sp,
-                              int from, int to);
-extern void smp_restart_with_online_cpu(void);
-extern void smp_restart_cpu(void);
+extern void smp_call_online_cpu(void (*func)(void *), void *);
+extern void smp_call_ipl_cpu(void (*func)(void *), void *);
 
-/*
- * returns 1 if (virtual) cpu is scheduled
- * returns 0 otherwise
- */
-static inline int smp_vcpu_scheduled(int cpu)
-{
-        u32 status;
-
-        switch (sigp_ps(&status, 0, cpu, sigp_sense_running)) {
-        case sigp_status_stored:
-                /* Check for running status */
-                if (status & 0x400)
-                        return 0;
-                break;
-        case sigp_not_operational:
-                return 0;
-        default:
-                break;
-        }
-        return 1;
-}
+extern int smp_find_processor_id(u16 address);
+extern int smp_store_status(int cpu);
+extern int smp_vcpu_scheduled(int cpu);
+extern void smp_yield_cpu(int cpu);
+extern void smp_yield(void);
+extern void smp_stop_cpu(void);
 
 #else /* CONFIG_SMP */
 
-static inline void smp_switch_to_ipl_cpu(void (*func)(void *), void *data)
+static inline void smp_call_ipl_cpu(void (*func)(void *), void *data)
 {
         func(data);
 }
 
-static inline void smp_restart_with_online_cpu(void)
+static inline void smp_call_online_cpu(void (*func)(void *), void *data)
 {
+        func(data);
 }
 
-#define smp_vcpu_scheduled      (1)
+static inline int smp_find_processor_id(int address) { return 0; }
+static inline int smp_vcpu_scheduled(int cpu) { return 1; }
+static inline void smp_yield_cpu(int cpu) { }
+static inline void smp_yield(void) { }
+static inline void smp_stop_cpu(void) { }
 
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern int smp_rescan_cpus(void);
 extern void __noreturn cpu_die(void);
+extern void __cpu_die(unsigned int cpu);
+extern int __cpu_disable(void);
 #else
 static inline int smp_rescan_cpus(void) { return 0; }
 static inline void cpu_die(void) { }
diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
index d73cc6b60000..2e0bb7f0f9b2 100644
--- a/arch/s390/include/asm/system.h
+++ b/arch/s390/include/asm/system.h
@@ -7,8 +7,10 @@
 #ifndef __ASM_SYSTEM_H
 #define __ASM_SYSTEM_H
 
+#include <linux/preempt.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <asm/types.h>
 #include <asm/ptrace.h>
 #include <asm/setup.h>
@@ -248,6 +250,38 @@ static inline int test_facility(unsigned long nr)
         return (*ptr & (0x80 >> (nr & 7))) != 0;
 }
 
+/**
+ * stfle - Store facility list extended
+ * @stfle_fac_list: array where facility list can be stored
+ * @size: size of passed in array in double words
+ */
+static inline void stfle(u64 *stfle_fac_list, int size)
+{
+        unsigned long nr;
+
+        preempt_disable();
+        S390_lowcore.stfl_fac_list = 0;
+        asm volatile(
+                "       .insn s,0xb2b10000,0(0)\n" /* stfl */
+                "0:\n"
+                EX_TABLE(0b, 0b)
+                : "=m" (S390_lowcore.stfl_fac_list));
+        nr = 4; /* bytes stored by stfl */
+        memcpy(stfle_fac_list, &S390_lowcore.stfl_fac_list, 4);
+        if (S390_lowcore.stfl_fac_list & 0x01000000) {
+                /* More facility bits available with stfle */
+                register unsigned long reg0 asm("0") = size - 1;
+
+                asm volatile(".insn s,0xb2b00000,0(%1)" /* stfle */
+                             : "+d" (reg0)
+                             : "a" (stfle_fac_list)
+                             : "memory", "cc");
+                nr = (reg0 + 1) * 8; /* # bytes stored by stfle */
+        }
+        memset((char *) stfle_fac_list + nr, 0, size * 8 - nr);
+        preempt_enable();
+}
+
 static inline unsigned short stap(void)
 {
         unsigned short cpu_address;
diff --git a/arch/s390/include/asm/timer.h b/arch/s390/include/asm/timer.h
index 814243cafdfe..e63069ba39e3 100644
--- a/arch/s390/include/asm/timer.h
+++ b/arch/s390/include/asm/timer.h
@@ -33,8 +33,8 @@ struct vtimer_queue {
         spinlock_t lock;
         __u64 timer;            /* last programmed timer */
         __u64 elapsed;          /* elapsed time of timer expire values */
-        __u64 idle;             /* temp var for idle */
-        int do_spt;             /* =1: reprogram cpu timer in idle */
+        __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);
diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h
index 533f35751aeb..c4a11cfad3c8 100644
--- a/arch/s390/include/asm/vdso.h
+++ b/arch/s390/include/asm/vdso.h
@@ -40,8 +40,8 @@ struct vdso_per_cpu_data {
 extern struct vdso_data *vdso_data;
 
 #ifdef CONFIG_64BIT
-int vdso_alloc_per_cpu(int cpu, struct _lowcore *lowcore);
-void vdso_free_per_cpu(int cpu, struct _lowcore *lowcore);
+int vdso_alloc_per_cpu(struct _lowcore *lowcore);
+void vdso_free_per_cpu(struct _lowcore *lowcore);
 #endif
 
 #endif /* __ASSEMBLY__ */