← Back to branch summary

~ubuntu-branches/ubuntu/hoary/s390-tools/hoary

« back to all changes in this revision

Viewing changes to zfcpdump/kernel/patches/linux-2.4.19-s390-gcc-3.3.diff

  • Committer: Bazaar Package Importer
  • Author(s): Bastian Blank
  • Date: 2004-06-27 18:45:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20040627184515-q7lnvli1j94gr6dv
Tags: upstream-1.3.1
Import upstream version 1.3.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
zfcpdump/kernel/patches/linux-2.4.19-s390-gcc-3.3.diff
 
1
diff -Naur linux-2.4.19/drivers/s390/block/dasd_eckd.h linux-2.4.19-s390-gcc-3.3/drivers/s390/block/dasd_eckd.h
 
2
--- linux-2.4.19/drivers/s390/block/dasd_eckd.h 2003-04-08 19:35:04.000000000 +0200
 
3
+++ linux-2.4.19-s390-gcc-3.3/drivers/s390/block/dasd_eckd.h    2003-04-08 19:18:48.000000000 +0200
 
4
@@ -119,7 +119,7 @@
 
5
                unsigned char cfw:1;    /* Cache fast write */
 
6
                unsigned char dfw:1;    /* DASD fast write */
 
7
        } __attribute__ ((packed)) attributes;
 
8
-       __u16 short blk_size;   /* Blocksize */
 
9
+       __u16 blk_size;         /* Blocksize */
 
10
        __u16 fast_write_id;
 
11
        __u8 ga_additional;     /* Global Attributes Additional */
 
12
        __u8 ga_extended;       /* Global Attributes Extended   */
 
13
diff -Naur linux-2.4.19/drivers/s390/qdio.c linux-2.4.19-s390-gcc-3.3/drivers/s390/qdio.c
 
14
--- linux-2.4.19/drivers/s390/qdio.c    2003-04-08 19:20:42.000000000 +0200
 
15
+++ linux-2.4.19-s390-gcc-3.3/drivers/s390/qdio.c       2003-04-08 19:18:13.000000000 +0200
 
16
@@ -2784,7 +2784,8 @@
 
17
 
 
18
        my_s390irq_spin_unlock_irqrestore(irq_ptr->irq,saveflags);
 
19
 
 
20
-#define TAKEOVER_CIW(x) irq_ptr->commands.##x=ioinfo[irq_ptr->irq]->senseid.ciw[ciw_cnt].cmd; irq_ptr->commands.count_##x=ioinfo[irq_ptr->irq]->senseid.ciw[ciw_cnt].count
 
21
+#define TAKEOVER_CIW(x) irq_ptr->commands.x=ioinfo[irq_ptr->irq]->senseid.ciw[ciw_cnt].cmd; irq_ptr->commands.count_##x=ioinfo[irq_ptr->irq]->senseid.ciw[ciw_cnt].count
 
22
+
 
23
        /* get qdio commands */
 
24
        found=0;
 
25
        for (ciw_cnt=0;ciw_cnt<MAX_CIWS;ciw_cnt++) {
 
26
diff -Naur linux-2.4.19/include/asm-s390/unistd.h linux-2.4.19-s390-gcc-3.3/include/asm-s390/unistd.h
 
27
--- linux-2.4.19/include/asm-s390/unistd.h      2003-04-08 19:20:29.000000000 +0200
 
28
+++ linux-2.4.19-s390-gcc-3.3/include/asm-s390/unistd.h 2003-04-08 19:18:26.000000000 +0200
 
29
@@ -230,11 +230,11 @@
 
30
         return (type) (res);                                 \
 
31
 } while (0)
 
32
 
 
33
-#define _svc_clobber "2", "cc", "memory"
 
34
+#define _svc_clobber "cc", "memory"
 
35
 
 
36
 #define _syscall0(type,name)                                 \
 
37
 type name(void) {                                            \
 
38
-        long __res;                                          \
 
39
+        register long __res asm("2");                        \
 
40
         __asm__ __volatile__ (                               \
 
41
                 "    svc %b1\n"                              \
 
42
                 "    lr  %0,2"                               \
 
43
@@ -247,13 +247,13 @@
 
44
 #define _syscall1(type,name,type1,arg1)                      \
 
45
 type name(type1 arg1) {                                      \
 
46
         register type1 __arg1 asm("2") = arg1;               \
 
47
-        long __res;                                          \
 
48
+        register long __res asm("2");                        \
 
49
         __asm__ __volatile__ (                               \
 
50
                 "    svc %b1\n"                              \
 
51
                 "    lr  %0,2"                               \
 
52
                 : "=d" (__res)                               \
 
53
                 : "i" (__NR_##name),                         \
 
54
-                  "d" (__arg1)                               \
 
55
+                  "0" (__arg1)                               \
 
56
                 : _svc_clobber );                            \
 
57
         __syscall_return(type,__res);                        \
 
58
 }
 
59
@@ -262,13 +262,13 @@
 
60
 type name(type1 arg1, type2 arg2) {                          \
 
61
         register type1 __arg1 asm("2") = arg1;               \
 
62
         register type2 __arg2 asm("3") = arg2;               \
 
63
-        long __res;                                          \
 
64
+        register long __res asm("2");                        \
 
65
         __asm__ __volatile__ (                               \
 
66
                 "    svc %b1\n"                              \
 
67
                 "    lr  %0,2"                               \
 
68
                 : "=d" (__res)                               \
 
69
                 : "i" (__NR_##name),                         \
 
70
-                  "d" (__arg1),                              \
 
71
+                  "0" (__arg1),                              \
 
72
                   "d" (__arg2)                               \
 
73
                 : _svc_clobber );                            \
 
74
         __syscall_return(type,__res);                        \
 
75
@@ -279,13 +279,13 @@
 
76
         register type1 __arg1 asm("2") = arg1;               \
 
77
         register type2 __arg2 asm("3") = arg2;               \
 
78
         register type3 __arg3 asm("4") = arg3;               \
 
79
-        long __res;                                          \
 
80
+        register long __res asm("2");                        \
 
81
         __asm__ __volatile__ (                               \
 
82
                 "    svc %b1\n"                              \
 
83
                 "    lr  %0,2"                               \
 
84
                 : "=d" (__res)                               \
 
85
                 : "i" (__NR_##name),                         \
 
86
-                  "d" (__arg1),                              \
 
87
+                  "0" (__arg1),                              \
 
88
                   "d" (__arg2),                              \
 
89
                   "d" (__arg3)                               \
 
90
                 : _svc_clobber );                            \
 
91
@@ -299,13 +299,13 @@
 
92
         register type2 __arg2 asm("3") = arg2;               \
 
93
         register type3 __arg3 asm("4") = arg3;               \
 
94
         register type4 __arg4 asm("5") = arg4;               \
 
95
-        long __res;                                          \
 
96
+        register long __res asm("2");                        \
 
97
         __asm__ __volatile__ (                               \
 
98
                 "    svc %b1\n"                              \
 
99
                 "    lr  %0,2"                               \
 
100
                 : "=d" (__res)                               \
 
101
                 : "i" (__NR_##name),                         \
 
102
-                  "d" (__arg1),                              \
 
103
+                  "0" (__arg1),                              \
 
104
                   "d" (__arg2),                              \
 
105
                   "d" (__arg3),                              \
 
106
                   "d" (__arg4)                               \
 
107
@@ -322,13 +322,13 @@
 
108
         register type3 __arg3 asm("4") = arg3;               \
 
109
         register type4 __arg4 asm("5") = arg4;               \
 
110
         register type5 __arg5 asm("6") = arg5;               \
 
111
-        long __res;                                          \
 
112
+        register long __res asm("2");                        \
 
113
         __asm__ __volatile__ (                               \
 
114
                 "    svc %b1\n"                              \
 
115
                 "    lr  %0,2"                               \
 
116
                 : "=d" (__res)                               \
 
117
                 : "i" (__NR_##name),                         \
 
118
-                  "d" (__arg1),                              \
 
119
+                  "0" (__arg1),                              \
 
120
                   "d" (__arg2),                              \
 
121
                   "d" (__arg3),                              \
 
122
                   "d" (__arg4),                              \
 
123
diff -Naur linux-2.4.19/include/asm-s390x/unistd.h linux-2.4.19-s390-gcc-3.3/include/asm-s390x/unistd.h
 
124
--- linux-2.4.19/include/asm-s390x/unistd.h     2003-04-08 19:20:34.000000000 +0200
 
125
+++ linux-2.4.19-s390-gcc-3.3/include/asm-s390x/unistd.h        2003-04-08 19:18:33.000000000 +0200
 
126
@@ -199,11 +199,11 @@
 
127
         return (type) (res);                                 \
 
128
 } while (0)
 
129
 
 
130
-#define _svc_clobber "2", "cc", "memory"
 
131
+#define _svc_clobber "cc", "memory"
 
132
 
 
133
 #define _syscall0(type,name)                                 \
 
134
 type name(void) {                                            \
 
135
-        long __res;                                          \
 
136
+        register long __res asm("2");                        \
 
137
         __asm__ __volatile__ (                               \
 
138
                 "    svc %b1\n"                              \
 
139
                 "    lgr  %0,2"                              \
 
140
@@ -216,13 +216,13 @@
 
141
 #define _syscall1(type,name,type1,arg1)                      \
 
142
 type name(type1 arg1) {                                      \
 
143
         register type1 __arg1 asm("2") = arg1;               \
 
144
-        long __res;                                          \
 
145
+        register long __res asm("2");                        \
 
146
         __asm__ __volatile__ (                               \
 
147
                 "    svc %b1\n"                              \
 
148
                 "    lgr  %0,2"                              \
 
149
                 : "=d" (__res)                               \
 
150
                 : "i" (__NR_##name),                         \
 
151
-                  "d" (__arg1)                               \
 
152
+                  "0" (__arg1)                               \
 
153
                 : _svc_clobber );                            \
 
154
         __syscall_return(type,__res);                        \
 
155
 }
 
156
@@ -231,13 +231,13 @@
 
157
 type name(type1 arg1, type2 arg2) {                          \
 
158
         register type1 __arg1 asm("2") = arg1;               \
 
159
         register type2 __arg2 asm("3") = arg2;               \
 
160
-        long __res;                                          \
 
161
+        register long __res asm("2");                        \
 
162
         __asm__ __volatile__ (                               \
 
163
                 "    svc %b1\n"                              \
 
164
                 "    lgr  %0,2"                              \
 
165
                 : "=d" (__res)                               \
 
166
                 : "i" (__NR_##name),                         \
 
167
-                  "d" (__arg1),                              \
 
168
+                  "0" (__arg1),                              \
 
169
                   "d" (__arg2)                               \
 
170
                 : _svc_clobber );                            \
 
171
         __syscall_return(type,__res);                        \
 
172
@@ -248,13 +248,13 @@
 
173
         register type1 __arg1 asm("2") = arg1;               \
 
174
         register type2 __arg2 asm("3") = arg2;               \
 
175
         register type3 __arg3 asm("4") = arg3;               \
 
176
-        long __res;                                          \
 
177
+        register long __res asm("2");                        \
 
178
         __asm__ __volatile__ (                               \
 
179
                 "    svc %b1\n"                              \
 
180
                 "    lgr  %0,2"                              \
 
181
                 : "=d" (__res)                               \
 
182
                 : "i" (__NR_##name),                         \
 
183
-                  "d" (__arg1),                              \
 
184
+                  "0" (__arg1),                              \
 
185
                   "d" (__arg2),                              \
 
186
                   "d" (__arg3)                               \
 
187
                 : _svc_clobber );                            \
 
188
@@ -268,13 +268,13 @@
 
189
         register type2 __arg2 asm("3") = arg2;               \
 
190
         register type3 __arg3 asm("4") = arg3;               \
 
191
         register type4 __arg4 asm("5") = arg4;               \
 
192
-        long __res;                                          \
 
193
+        register long __res asm("2");                        \
 
194
         __asm__ __volatile__ (                               \
 
195
                 "    svc %b1\n"                              \
 
196
                 "    lgr  %0,2"                              \
 
197
                 : "=d" (__res)                               \
 
198
                 : "i" (__NR_##name),                         \
 
199
-                  "d" (__arg1),                              \
 
200
+                  "0" (__arg1),                              \
 
201
                   "d" (__arg2),                              \
 
202
                   "d" (__arg3),                              \
 
203
                   "d" (__arg4)                               \
 
204
@@ -291,13 +291,13 @@
 
205
         register type3 __arg3 asm("4") = arg3;               \
 
206
         register type4 __arg4 asm("5") = arg4;               \
 
207
         register type5 __arg5 asm("6") = arg5;               \
 
208
-        long __res;                                          \
 
209
+        register long __res asm("2");                        \
 
210
         __asm__ __volatile__ (                               \
 
211
                 "    svc %b1\n"                              \
 
212
                 "    lgr  %0,2"                              \
 
213
                 : "=d" (__res)                               \
 
214
                 : "i" (__NR_##name),                         \
 
215
-                  "d" (__arg1),                              \
 
216
+                  "0" (__arg1),                              \
 
217
                   "d" (__arg2),                              \
 
218
                   "d" (__arg3),                              \
 
219
                   "d" (__arg4),                              \