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

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (35 commits)
  [S390] time: remove unused code
  [S390] zcore: Add prefix registers to dump header
  [S390] correct vdso version string
  [S390] add support for compressed kernels
  [S390] Define new s390 ELF note sections in elf.h
  [S390] codepage conversion of kernel parameter line
  [S390] seq_file: convert drivers/s390/
  [S390] add z9-ec/z10 instruction to kernel disassembler
  [S390] dasd: correct offline processing
  [S390] dasd: fix refcounting.
  [S390] dasd: fix online/offline race
  [S390] use kprobes_built_in() in mm/fault code
  [S390] bug: use relative pointers in bug table entries
  [S390] Cleanup struct _lowcore usage and defines.
  [S390] free_initmem: reduce code duplication
  [S390] Replace ENOTSUPP usage with EOPNOTSUPP
  [S390] spinlock: check virtual cpu running status
  [S390] sysinfo: fix SYSIB 3,2,2 structure
  [S390] add MACHINE_IS_LPAR flag
  [S390] qdio: optimize cache line usage of struct qdio_irq
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index b42715458312..73e259834e10 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -28,7 +28,7 @@
 
 static inline void get_cpu_id(struct cpuid *ptr)
 {
-        asm volatile("stidp 0(%1)" : "=m" (*ptr) : "a" (ptr));
+        asm volatile("stidp %0" : "=Q" (*ptr));
 }
 
 extern void s390_adjust_jiffies(void);
@@ -184,9 +184,9 @@ static inline void psw_set_key(unsigned int key)
 static inline void __load_psw(psw_t psw)
 {
 #ifndef __s390x__
-        asm volatile("lpsw  0(%0)" : : "a" (&psw), "m" (psw) : "cc");
+        asm volatile("lpsw  %0" : : "Q" (psw) : "cc");
 #else
-        asm volatile("lpswe 0(%0)" : : "a" (&psw), "m" (psw) : "cc");
+        asm volatile("lpswe %0" : : "Q" (psw) : "cc");
 #endif
 }
 
@@ -206,17 +206,17 @@ static inline void __load_psw_mask (unsigned long mask)
         asm volatile(
                 "       basr    %0,0\n"
                 "0:     ahi     %0,1f-0b\n"
-                "       st      %0,4(%1)\n"
-                "       lpsw    0(%1)\n"
+                "       st      %0,%O1+4(%R1)\n"
+                "       lpsw    %1\n"
                 "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
+                : "=&d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");
 #else /* __s390x__ */
         asm volatile(
                 "       larl    %0,1f\n"
-                "       stg     %0,8(%1)\n"
-                "       lpswe   0(%1)\n"
+                "       stg     %0,%O1+8(%R1)\n"
+                "       lpswe   %1\n"
                 "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
+                : "=&d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");
 #endif /* __s390x__ */
 }