[PATCH] s390 update (21/27): sync i/o bug.

Remove bogus sanity check from {en,dis}able_sync_isc() and really disable all
interrupt sub classes except isc 7 in wait_cons_dev.

drivers/s390/cio/cio.c

@@ -1715,7 +1715,7 @@ wait_cons_dev (int irq)
 		 */
 		__ctl_store (cr6, 6, 6);
 		save_cr6 = cr6;
-		cr6 &= 0x01FFFFFF;
+		cr6 = 0x01000000;
 		__ctl_load (cr6, 6, 6);
 
 		do {
@@ -1855,9 +1855,6 @@ enable_cpu_sync_isc (int irq)
 
 	/* This one spins until it can get the sync_isc lock for irq# irq */
 
-	if ((irq <= highest_subchannel) && 
-	    (ioinfo[irq] != INVALID_STORAGE_AREA) &&
-	    (!ioinfo[irq]->st)) {
 	if (atomic_read (&sync_isc) != irq)
 		atomic_compare_and_swap_spin (-1, irq, &sync_isc);
 	
@@ -1889,13 +1886,8 @@ enable_cpu_sync_isc (int irq)
 		sync_isc_cnt = 0;
 		atomic_set (&sync_isc, -1);
 	}
-	} else {
-
-		rc = -EINVAL;
 
-	}
-
-	return (rc);
+	return rc;
 }
 
 
@@ -1910,9 +1902,6 @@ disable_cpu_sync_isc (int irq)
 	sprintf (dbf_txt, "disisc%x", irq);
 	CIO_TRACE_EVENT (4, dbf_txt);
 
-	if ((irq <= highest_subchannel) && 
-	    (ioinfo[irq] != INVALID_STORAGE_AREA) && 
-	    (!ioinfo[irq]->st)) {
 	/*
 	 * We disable if we're the top user only, as we may
 	 *  run recursively ... 
@@ -1941,13 +1930,8 @@ disable_cpu_sync_isc (int irq)
 		sync_isc_cnt--;
 		
 	}
-	} else {
-
-		rc = -EINVAL;
 
-	}
-
-	return (rc);
+	return rc;
 }
 
 EXPORT_SYMBOL (halt_IO);