6 files changed, 12 insertions, 49 deletions

diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index 4d2b126ba159..0ddcdba79e4a 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -12,6 +12,9 @@
  *    Copyright (C) 1992, Linus Torvalds
  *
  */
+
+#ifdef __KERNEL__
+
 #include <linux/compiler.h>
 
 /*
@@ -50,19 +53,6 @@
  * with operation of the form "set_bit(bitnr, flags)".
  */
 
-/* set ALIGN_CS to 1 if the SMP safe bit operations should
- * align the address to 4 byte boundary. It seems to work
- * without the alignment. 
- */
-#ifdef __KERNEL__
-#define ALIGN_CS 0
-#else
-#define ALIGN_CS 1
-#ifndef CONFIG_SMP
-#error "bitops won't work without CONFIG_SMP"
-#endif
-#endif
-
 /* bitmap tables from arch/S390/kernel/bitmap.S */
 extern const char _oi_bitmap[];
 extern const char _ni_bitmap[];
@@ -121,10 +111,6 @@ static inline void set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;    /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;         /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make OR mask */
@@ -141,10 +127,6 @@ static inline void clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;    /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;         /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make AND mask */
@@ -161,10 +143,6 @@ static inline void change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;    /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;         /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make XOR mask */
@@ -182,10 +160,6 @@ test_and_set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;    /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;         /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make OR/test mask */
@@ -205,10 +179,6 @@ test_and_clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;    /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;         /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make AND/test mask */
@@ -228,10 +198,6 @@ test_and_change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr, old, new, mask;
 
         addr = (unsigned long) ptr;
-#if ALIGN_CS == 1
-        nr += (addr & __BITOPS_ALIGN) << 3;  /* add alignment to bit number */
-        addr ^= addr & __BITOPS_ALIGN;       /* align address to 8 */
-#endif
         /* calculate address for CS */
         addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
         /* make XOR/test mask */
@@ -834,8 +800,6 @@ static inline int sched_find_first_bit(unsigned long *b)
 
 #include <asm-generic/bitops/hweight.h>
 
-#ifdef __KERNEL__
-
 /*
  * ATTENTION: intel byte ordering convention for ext2 and minix !!
  * bit 0 is the LSB of addr; bit 31 is the MSB of addr;
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index 089cf567c317..2b1619306351 100644
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -276,6 +276,8 @@ extern void wait_cons_dev(void);
 
 extern void clear_all_subchannels(void);
 
+extern void css_schedule_reprobe(void);
+
 #endif
 
 #endif
diff --git a/include/asm-s390/cmb.h b/include/asm-s390/cmb.h
index 2d09950a9c11..241756f80df3 100644
--- a/include/asm-s390/cmb.h
+++ b/include/asm-s390/cmb.h
@@ -44,10 +44,6 @@ struct cmbdata {
 #define BIODASDCMFENABLE        _IO(DASD_IOCTL_LETTER,32)
 /* enable channel measurement */
 #define BIODASDCMFDISABLE       _IO(DASD_IOCTL_LETTER,33)
-/* reset channel measurement block */
-#define BIODASDRESETCMB         _IO(DASD_IOCTL_LETTER,34)
-/* read channel measurement data */
-#define BIODASDREADCMB          _IOWR(DASD_IOCTL_LETTER,32,__u64)
 /* read channel measurement data */
 #define BIODASDREADALLCMB       _IOWR(DASD_IOCTL_LETTER,33,struct cmbdata)
 
diff --git a/include/asm-s390/dasd.h b/include/asm-s390/dasd.h
index 1630c26e8f45..c042f9578081 100644
--- a/include/asm-s390/dasd.h
+++ b/include/asm-s390/dasd.h
@@ -68,10 +68,12 @@ typedef struct dasd_information2_t {
  * 0x00: default features
  * 0x01: readonly (ro)
  * 0x02: use diag discipline (diag)
+ * 0x04: set the device initially online (internal use only)
  */
-#define DASD_FEATURE_DEFAULT  0
-#define DASD_FEATURE_READONLY 1
-#define DASD_FEATURE_USEDIAG  2
+#define DASD_FEATURE_DEFAULT         0x00
+#define DASD_FEATURE_READONLY        0x01
+#define DASD_FEATURE_USEDIAG         0x02
+#define DASD_FEATURE_INITIAL_ONLINE  0x04
 
 #define DASD_PARTN_BITS 2
 
diff --git a/include/asm-s390/thread_info.h b/include/asm-s390/thread_info.h
index 8e0c7ed73d03..0a518915bf90 100644
--- a/include/asm-s390/thread_info.h
+++ b/include/asm-s390/thread_info.h
@@ -63,6 +63,7 @@ struct thread_info {
         .exec_domain    = &default_exec_domain, \
         .flags          = 0,                    \
         .cpu            = 0,                    \
+        .preempt_count  = 1,                    \
         .restart_block  = {                     \
                 .fn = do_no_restart_syscall,    \
         },                                      \
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index e21443d3ea1d..aa7a243862e1 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -394,11 +394,9 @@
 
 #ifdef __KERNEL__
 
-/* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */
-
 #define __syscall_return(type, res)                          \
 do {                                                         \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-4095)) {\
                 errno = -(res);                              \
                 res = -1;                                    \
         }                                                    \