patch-2.2.17 linux/include/asm-s390/irq.h

• Lines: 127
• Date: Mon Sep 4 18:39:28 2000
• Orig file: v2.2.16/include/asm-s390/irq.h
• Orig date: Mon Sep 4 18:37:16 2000

diff -u --recursive --new-file v2.2.16/include/asm-s390/irq.h linux/include/asm-s390/irq.h
@@ -1,6 +1,7 @@
 #ifndef __irq_h
 #define __irq_h
 
+#ifdef __KERNEL__
 #include <asm/hardirq.h>
 
 /*
@@ -9,6 +10,8 @@
 #define __MAX_SUBCHANNELS 65536
 #define NR_IRQS           __MAX_SUBCHANNELS
 
+#define LPM_ANYPATH 0xff /* doesn't really belong here, Ingo? */
+
 #define INVALID_STORAGE_AREA ((void *)(-1 - 0x3FFF ))
 
 extern int disable_irq(unsigned int);
@@ -68,6 +71,8 @@
                                    /*  ... in an operand exception.       */
    } __attribute__ ((packed)) pmcw_t;
 
+#endif /* __KERNEL__ */
+
 /*
  * subchannel status word
  */
@@ -130,6 +135,8 @@
 #define SCHN_STAT_INTF_CTRL_CHK  0x02
 #define SCHN_STAT_CHAIN_CHECK    0x01
 
+#ifdef __KERNEL__
+
 /*
  * subchannel information block
  */
@@ -139,6 +146,8 @@
       char mda[12];            /* model dependent area */
    } schib_t __attribute__ ((packed,aligned(4)));
 
+#endif /* __KERNEL__ */
+
 typedef struct {
       char            cmd_code;/* command code */
       char            flags;   /* flags, like IDA adressing, etc. */
@@ -164,6 +173,8 @@
 #define CCW_CMD_SET_PGID        0xAF
 #define CCW_CMD_SENSE_ID        0xE4
 
+#ifdef __KERNEL__
+
 #define SENSE_MAX_COUNT         0x20
 
 /*
@@ -197,6 +208,8 @@
       ccw1_t        *cpa;      /* channel program address */
    }  __attribute__ ((packed,aligned(4))) orb_t;
 
+#endif /* __KERNEL__ */
+
 typedef struct {
       unsigned int res0  : 4;  /* reserved */
       unsigned int pvrf  : 1;  /* path-verification-required flag */
@@ -284,6 +297,8 @@
       char   ecw[32];          /* extended control word */
    } irb_t __attribute__ ((aligned(4)));
 
+#ifdef __KERNEL__
+
 /*
  * TPI info structure
  */
@@ -323,6 +338,8 @@
       ciw_t    ciw[16];            /* variable # of CIWs */
    }  __attribute__ ((packed,aligned(4))) senseid_t;
 
+#endif /* __KERNEL__ */
+
 /*
  * sense data
  */
@@ -331,6 +348,7 @@
       unsigned char data[32];  /* sense data */
    } sense_t;
 
+
 /*
  * device status area, to be provided by the device driver
  *  when calling request_irq() as parameter "dev_id", later
@@ -367,16 +385,20 @@
 #define DEVSTAT_CLEAR_FUNCTION     0x00000100
 #define DEVSTAT_PCI                0x00000200
 #define DEVSTAT_SUSPENDED          0x00000400
+#define DEVSTAT_UNKNOWN_DEV        0x00000800
 #define DEVSTAT_FINAL_STATUS       0x80000000
 
 #define INTPARM_STATUS_PENDING     0xFFFFFFFF
 
+#ifdef __KERNEL__
+
 typedef  void (* io_handler_func1_t) ( int  irq,
                                        devstat_t *devstat,
                                        struct pt_regs *rgs);
 
 typedef  void (* io_handler_func_t) ( int  irq,
-                                      __u32 intparm );
+                                      void           *devstat,
+                                      struct pt_regs *rgs);
 
 typedef  void ( * not_oper_handler_func_t)( int irq,
                                             int status );
@@ -777,7 +799,7 @@
  * x86 profiling function, SMP safe. We might want to do this in
  * assembly totally?
  */
-extern unsigned long _stext;
+extern char _stext;
 static inline void s390_do_profile (unsigned long addr)
 {
         if (prof_buffer && current->pid) {
@@ -808,6 +830,7 @@
 
 #define s390irq_spin_unlock_irqrestore(irq,flags) \
         spin_unlock_irqrestore(&(ioinfo[irq]->irq_lock), flags)
+#endif /* __KERNEL__ */
 
 #endif