diff options
| author | Cornelia Huck <cohuck@de.ibm.com> | 2005-09-03 18:58:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:28 -0400 |
| commit | 4c24da79e29537f0e240a331220a1c46cb9bc085 (patch) | |
| tree | c71f0c6433274a5f029884f630a3a03c7bba8a30 /drivers/s390/cio/ioasm.h | |
| parent | fd49f41aa0c125ec649c56a45337b3024d6b1736 (diff) | |
[PATCH] s390: reIPL fix and extern/static inline
Common i/o layer changes:
- Collect the irb at the correct subchannel when waiting for the clear
interrupt during subchannel cleaning befor reIPL - don't stop at the first
interrupt that comes in.
- Change "extern __inline__" to "static inline".
- Remove unneeded qdio includes.
Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/cio/ioasm.h')
| -rw-r--r-- | drivers/s390/cio/ioasm.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h index c874607d9a80..45480a2bc4c0 100644 --- a/drivers/s390/cio/ioasm.h +++ b/drivers/s390/cio/ioasm.h | |||
| @@ -21,7 +21,7 @@ struct tpi_info { | |||
| 21 | * Some S390 specific IO instructions as inline | 21 | * Some S390 specific IO instructions as inline |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | extern __inline__ int stsch(int irq, volatile struct schib *addr) | 24 | static inline int stsch(int irq, volatile struct schib *addr) |
| 25 | { | 25 | { |
| 26 | int ccode; | 26 | int ccode; |
| 27 | 27 | ||
| @@ -36,7 +36,7 @@ extern __inline__ int stsch(int irq, volatile struct schib *addr) | |||
| 36 | return ccode; | 36 | return ccode; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | extern __inline__ int msch(int irq, volatile struct schib *addr) | 39 | static inline int msch(int irq, volatile struct schib *addr) |
| 40 | { | 40 | { |
| 41 | int ccode; | 41 | int ccode; |
| 42 | 42 | ||
| @@ -51,7 +51,7 @@ extern __inline__ int msch(int irq, volatile struct schib *addr) | |||
| 51 | return ccode; | 51 | return ccode; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | extern __inline__ int msch_err(int irq, volatile struct schib *addr) | 54 | static inline int msch_err(int irq, volatile struct schib *addr) |
| 55 | { | 55 | { |
| 56 | int ccode; | 56 | int ccode; |
| 57 | 57 | ||
| @@ -79,7 +79,7 @@ extern __inline__ int msch_err(int irq, volatile struct schib *addr) | |||
| 79 | return ccode; | 79 | return ccode; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | extern __inline__ int tsch(int irq, volatile struct irb *addr) | 82 | static inline int tsch(int irq, volatile struct irb *addr) |
| 83 | { | 83 | { |
| 84 | int ccode; | 84 | int ccode; |
| 85 | 85 | ||
| @@ -94,7 +94,7 @@ extern __inline__ int tsch(int irq, volatile struct irb *addr) | |||
| 94 | return ccode; | 94 | return ccode; |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | extern __inline__ int tpi( volatile struct tpi_info *addr) | 97 | static inline int tpi( volatile struct tpi_info *addr) |
| 98 | { | 98 | { |
| 99 | int ccode; | 99 | int ccode; |
| 100 | 100 | ||
| @@ -108,7 +108,7 @@ extern __inline__ int tpi( volatile struct tpi_info *addr) | |||
| 108 | return ccode; | 108 | return ccode; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | extern __inline__ int ssch(int irq, volatile struct orb *addr) | 111 | static inline int ssch(int irq, volatile struct orb *addr) |
| 112 | { | 112 | { |
| 113 | int ccode; | 113 | int ccode; |
| 114 | 114 | ||
| @@ -123,7 +123,7 @@ extern __inline__ int ssch(int irq, volatile struct orb *addr) | |||
| 123 | return ccode; | 123 | return ccode; |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | extern __inline__ int rsch(int irq) | 126 | static inline int rsch(int irq) |
| 127 | { | 127 | { |
| 128 | int ccode; | 128 | int ccode; |
| 129 | 129 | ||
| @@ -138,7 +138,7 @@ extern __inline__ int rsch(int irq) | |||
| 138 | return ccode; | 138 | return ccode; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | extern __inline__ int csch(int irq) | 141 | static inline int csch(int irq) |
| 142 | { | 142 | { |
| 143 | int ccode; | 143 | int ccode; |
| 144 | 144 | ||
| @@ -153,7 +153,7 @@ extern __inline__ int csch(int irq) | |||
| 153 | return ccode; | 153 | return ccode; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | extern __inline__ int hsch(int irq) | 156 | static inline int hsch(int irq) |
| 157 | { | 157 | { |
| 158 | int ccode; | 158 | int ccode; |
| 159 | 159 | ||
| @@ -168,7 +168,7 @@ extern __inline__ int hsch(int irq) | |||
| 168 | return ccode; | 168 | return ccode; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | extern __inline__ int xsch(int irq) | 171 | static inline int xsch(int irq) |
| 172 | { | 172 | { |
| 173 | int ccode; | 173 | int ccode; |
| 174 | 174 | ||
| @@ -183,7 +183,7 @@ extern __inline__ int xsch(int irq) | |||
| 183 | return ccode; | 183 | return ccode; |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | extern __inline__ int chsc(void *chsc_area) | 186 | static inline int chsc(void *chsc_area) |
| 187 | { | 187 | { |
| 188 | int cc; | 188 | int cc; |
| 189 | 189 | ||
| @@ -198,7 +198,7 @@ extern __inline__ int chsc(void *chsc_area) | |||
| 198 | return cc; | 198 | return cc; |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | extern __inline__ int iac( void) | 201 | static inline int iac( void) |
| 202 | { | 202 | { |
| 203 | int ccode; | 203 | int ccode; |
| 204 | 204 | ||
| @@ -210,7 +210,7 @@ extern __inline__ int iac( void) | |||
| 210 | return ccode; | 210 | return ccode; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | extern __inline__ int rchp(int chpid) | 213 | static inline int rchp(int chpid) |
| 214 | { | 214 | { |
| 215 | int ccode; | 215 | int ccode; |
| 216 | 216 | ||