patch-2.4.25 linux-2.4.25/include/asm-s390/irq.h
Next file: linux-2.4.25/include/asm-s390/pgalloc.h
Previous file: linux-2.4.25/include/asm-s390/ioctl32.h
Back to the patch index
Back to the overall index
- Lines: 52
- Date:
2004-02-18 05:36:32.000000000 -0800
- Orig file:
linux-2.4.24/include/asm-s390/irq.h
- Orig date:
2003-08-25 04:44:44.000000000 -0700
diff -urN linux-2.4.24/include/asm-s390/irq.h linux-2.4.25/include/asm-s390/irq.h
@@ -16,9 +16,6 @@
#define INVALID_STORAGE_AREA ((void *)(-1 - 0x3FFF ))
-extern int disable_irq(unsigned int);
-extern int enable_irq(unsigned int);
-
/*
* path management control word
*/
@@ -420,14 +417,8 @@
__u32 reserved2;
/* word 5 */
__u32 reserved3;
- /* word 6 */
- __u32 ccdf; /* content-code dependent field */
- /* word 7 */
- __u32 reserved4;
- /* word 8 */
- __u32 reserved5;
- /* word 9 */
- __u32 reserved6;
+ /* word 6-102 */
+ __u32 ccdf[96]; /* content-code dependent field */
} __attribute__ ((packed,aligned(8))) sei_res;
struct {
/* word 2 */
@@ -445,6 +436,8 @@
__u8 chpid[8]; /* chpids 0-7 */
/* words 6-9 */
__u16 fla[8]; /* full link addresses 0-7 */
+ /* words 10-102 */
+ __u32 padding[92];
} __attribute__ ((packed,aligned(8))) ssd_res;
} response_block_data;
} __attribute__ ((packed,aligned(8))) response_block;
@@ -582,7 +575,6 @@
/* ... for suspended CCWs */
#define DOIO_TIMEOUT 0x0080 /* 3 secs. timeout for sync. I/O */
#define DOIO_DONT_CALL_INTHDLR 0x0100 /* don't call interrupt handler */
-#define DOIO_CANCEL_ON_TIMEOUT 0x0200 /* cancel I/O if it timed out */
#define DOIO_USE_DIAG98 0x0400 /* use DIAG98 instead of SSCH */
/*
@@ -665,7 +657,6 @@
void *dev_id);
extern int set_cons_dev(int irq);
-extern int reset_cons_dev(int irq);
extern int wait_cons_dev(int irq);
extern schib_t *s390_get_schib( int irq );
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)