1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
diff -u -r linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c
--- linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c 2003-10-11 11:42:28.000000000 +0200
@@ -629,7 +629,6 @@
#if 0
ret = request_irq(IRQ_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL);
if (ret)
- printk(KERN_ERR "PCI: unable to grab local bus timeout ".
- "interrupt: %d\n", ret);
+ printk(KERN_ERR "PCI: unable to grab local bus timeout interrupt: %d\n", ret);
#endif
}
diff -u -r linux-2.4.20-xfs-r3/arch/i386/math-emu/poly.h linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h
--- linux-2.4.20-xfs-r3/arch/i386/math-emu/poly.h 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h 2003-10-11 11:59:17.000000000 +0200
@@ -75,11 +75,11 @@
/* Add the 12 byte Xsig x2 to Xsig dest, with no checks for overflow. */
static inline void add_Xsig_Xsig(Xsig *dest, const Xsig *x2)
{
- asm volatile ("movl %1,%%edi; movl %2,%%esi;
- movl (%%esi),%%eax; addl %%eax,(%%edi);
- movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);
- movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
- :"=g" (*dest):"g" (dest), "g" (x2)
+ asm volatile ("movl %1,%%edi; movl %2,%%esi; " \
+ "movl (%%esi),%%eax; addl %%eax,(%%edi); " \
+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); " \
+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi); " \
+ :"=g" (*dest):"g" (dest), "g" (x2) \
:"ax","si","di");
}
@@ -90,18 +90,18 @@
problem, but keep fingers crossed! */
static inline void add_two_Xsig(Xsig *dest, const Xsig *x2, long int *exp)
{
- asm volatile ("movl %2,%%ecx; movl %3,%%esi;
- movl (%%esi),%%eax; addl %%eax,(%%ecx);
- movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);
- movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);
- jnc 0f;
- rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)
- movl %4,%%ecx; incl (%%ecx)
- movl $1,%%eax; jmp 1f;
- 0: xorl %%eax,%%eax;
- 1:"
- :"=g" (*exp), "=g" (*dest)
- :"g" (dest), "g" (x2), "g" (exp)
+ asm volatile ("movl %2,%%ecx; movl %3,%%esi; " \
+ "movl (%%esi),%%eax; addl %%eax,(%%ecx); " \
+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); " \
+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); " \
+ "jnc 0f; " \
+ "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx); " \
+ "movl %4,%%ecx; incl (%%ecx); " \
+ "movl $1,%%eax; jmp 1f; " \
+ "0: xorl %%eax,%%eax; " \
+ "1: " \
+ :"=g" (*exp), "=g" (*dest) \
+ :"g" (dest), "g" (x2), "g" (exp) \
:"cx","si","ax");
}
diff -u -r linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c
--- linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c 2003-10-11 11:44:44.000000000 +0200
@@ -1941,9 +1941,8 @@
#ifdef DEBUG_TLB
if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
(CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
- vma->vm_mm) & 0xff), pid);
+ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n",
+ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
}
#endif
diff -u -r linux-2.4.20-xfs-r3/arch/mips64/mm/tlb-r4k.c linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c
--- linux-2.4.20-xfs-r3/arch/mips64/mm/tlb-r4k.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c 2003-10-11 11:45:46.000000000 +0200
@@ -200,9 +200,8 @@
#ifdef DEBUG_TLB
if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
(CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
- vma->vm_mm) & 0xff), pid);
+ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n",
+ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
}
#endif
diff -u -r linux-2.4.20-xfs-r3/drivers/atm/zatm.c linux-2.4.20-xfs-r4/drivers/atm/zatm.c
--- linux-2.4.20-xfs-r3/drivers/atm/zatm.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/atm/zatm.c 2003-10-11 11:46:52.000000000 +0200
@@ -1430,8 +1430,7 @@
zout(uPD98401_GMR_ONE | uPD98401_BURST8 | uPD98401_BURST4 |
uPD98401_BURST2 | uPD98401_GMR_PM | uPD98401_GMR_DR,GMR);
/* TODO: should shrink allocation now */
- printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" :
- "MMF");
+ printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" : "MMF");
for (i = 0; i < ESI_LEN; i++)
printk("%02X%s",dev->esi[i],i == ESI_LEN-1 ? ")\n" : "-");
do {
diff -u -r linux-2.4.20-xfs-r3/drivers/char/h8.c linux-2.4.20-xfs-r4/drivers/char/h8.c
--- linux-2.4.20-xfs-r3/drivers/char/h8.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/char/h8.c 2003-10-11 11:47:16.000000000 +0200
@@ -574,8 +574,7 @@
}
if (intrbuf.word & H8_POWER_BUTTON) {
- printk(KERN_CRIT "Power switch pressed - please wait - preparing to power
-off\n");
+ printk(KERN_CRIT "Power switch pressed - please wait - preparing to power off\n");
h8_set_event_mask(H8_POWER_BUTTON);
wake_up(&h8_monitor_wait);
}
diff -u -r linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h
--- linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h 2003-10-11 11:47:59.000000000 +0200
@@ -438,7 +438,7 @@
byte curlba[3];
byte nslots;
- __u8 short slot_tablelen;
+ __u16 slot_tablelen;
};
diff -u -r linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h
--- linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h 2003-10-11 11:48:41.000000000 +0200
@@ -1079,10 +1079,10 @@
/******************************************************************************/
#define REG_RD(pDevice, OffsetName) \
- __raw_readl(&((pDevice)->pMemView->##OffsetName))
+ __raw_readl(&((pDevice)->pMemView->OffsetName))
#define REG_WR(pDevice, OffsetName, Value32) \
- (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName))
+ (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName))
#define REG_RD_OFFSET(pDevice, Offset) \
__raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset))
diff -u -r linux-2.4.20-xfs-r3/drivers/net/fealnx.c linux-2.4.20-xfs-r4/drivers/net/fealnx.c
--- linux-2.4.20-xfs-r3/drivers/net/fealnx.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/net/fealnx.c 2003-10-11 11:54:07.000000000 +0200
@@ -937,7 +937,7 @@
// 89/9/1 modify,
// np->bcrvalue=0x38;
np->bcrvalue = 0x10;
- np->cralue = 0xe00; /* rx 128 burst length */
+ np->crvalue = 0xe00; /* rx 128 burst length */
#warning Processor architecture undefined!
#endif
// 89/12/29 add,
@@ -1198,7 +1198,6 @@
printk("\n");
}
- + dev->if_port = np->default_port;
/* Reinit. Gross */
/* Reset the chip's Tx and Rx processes. */
diff -u -r linux-2.4.20-xfs-r3/drivers/net/irda/ma600.c linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c
--- linux-2.4.20-xfs-r3/drivers/net/irda/ma600.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c 2003-10-11 11:55:09.000000000 +0200
@@ -53,7 +53,7 @@
if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\
#expr,__FILE__,__FUNCTION__,__LINE__); \
- ##func}
+ func}
#endif
/* convert hex value to ascii hex */
diff -u -r linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c
--- linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c 2003-10-11 11:49:21.000000000 +0200
@@ -655,8 +655,8 @@
printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) );
printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
- printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
-%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
+ printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n",
+ olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
#endif
writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
diff -u -r linux-2.4.20-xfs-r3/drivers/scsi/sun3_NCR5380.c linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c
--- linux-2.4.20-xfs-r3/drivers/scsi/sun3_NCR5380.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c 2003-10-11 11:50:00.000000000 +0200
@@ -1226,8 +1226,7 @@
BASR_ACK)) ==
(BASR_PHASE_MATCH | BASR_ACK)) {
printk("scsi%d: BASR %02x\n", HOSTNO, NCR5380_read(BUS_AND_STATUS_REG));
- printk("scsi%d: bus stuck in data phase -- probably a
- single byte overrun!\n", HOSTNO);
+ printk("scsi%d: bus stuck in data phase -- probably a single byte overrun!\n", HOSTNO);
printk("not prepared for this error!\n");
printk("please e-mail sammy@sammy.net with a description of how this\n");
printk("error was produced.\n");
diff -u -r linux-2.4.20-xfs-r3/fs/reiserfs/super.c linux-2.4.20-xfs-r4/fs/reiserfs/super.c
--- linux-2.4.20-xfs-r3/fs/reiserfs/super.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/fs/reiserfs/super.c 2003-10-11 11:51:48.000000000 +0200
@@ -941,8 +941,8 @@
ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
- printk("reread_meta_blocks, error reading bitmap block number %d at
- %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+ printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n",
+ i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
return 1 ;
}
}
diff -u -r linux-2.4.20-xfs-r3/net/core/rtnetlink.c linux-2.4.20-xfs-r4/net/core/rtnetlink.c
--- linux-2.4.20-xfs-r3/net/core/rtnetlink.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/net/core/rtnetlink.c 2003-10-11 11:52:25.000000000 +0200
@@ -394,7 +394,7 @@
* Malformed skbs with wrong lengths of messages are discarded silently.
*/
-extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
+__inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
{
int err;
struct nlmsghdr * nlh;
diff -u -r linux-2.4.20-xfs-r3/net/decnet/dn_table.c linux-2.4.20-xfs-r4/net/decnet/dn_table.c
--- linux-2.4.20-xfs-r3/net/decnet/dn_table.c 2003-10-11 11:38:33.000000000 +0200
+++ linux-2.4.20-xfs-r4/net/decnet/dn_table.c 2003-10-11 11:52:48.000000000 +0200
@@ -836,8 +836,7 @@
return NULL;
if (in_interrupt() && net_ratelimit()) {
- printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table
-from interrupt\n");
+ printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n");
return NULL;
}
if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
|
GitWeb