/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1002_linux-2.6.11.3.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1002_linux-2.6.11.3.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 13699 byte(s)
Create 2.6.12 branch
1 diff -Nru a/Makefile b/Makefile
2 --- a/Makefile 2005-03-12 22:45:06 -08:00
3 +++ b/Makefile 2005-03-12 22:45:06 -08:00
4 @@ -1,7 +1,7 @@
5 VERSION = 2
6 PATCHLEVEL = 6
7 SUBLEVEL = 11
8 -EXTRAVERSION = .2
9 +EXTRAVERSION = .3
10 NAME=Woozy Numbat
11
12 # *DOCUMENTATION*
13 diff -Nru a/arch/ppc/oprofile/op_model_fsl_booke.c b/arch/ppc/oprofile/op_model_fsl_booke.c
14 --- a/arch/ppc/oprofile/op_model_fsl_booke.c 2005-03-12 22:45:06 -08:00
15 +++ b/arch/ppc/oprofile/op_model_fsl_booke.c 2005-03-12 22:45:06 -08:00
16 @@ -150,7 +150,6 @@
17 int is_kernel;
18 int val;
19 int i;
20 - unsigned int cpu = smp_processor_id();
21
22 /* set the PMM bit (see comment below) */
23 mtmsr(mfmsr() | MSR_PMM);
24 @@ -162,7 +161,7 @@
25 val = ctr_read(i);
26 if (val < 0) {
27 if (oprofile_running && ctr[i].enabled) {
28 - oprofile_add_sample(pc, is_kernel, i, cpu);
29 + oprofile_add_pc(pc, is_kernel, i);
30 ctr_write(i, reset_value[i]);
31 } else {
32 ctr_write(i, 0);
33 diff -Nru a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h
34 --- a/arch/ppc/platforms/4xx/ebony.h 2005-03-12 22:45:06 -08:00
35 +++ b/arch/ppc/platforms/4xx/ebony.h 2005-03-12 22:45:06 -08:00
36 @@ -61,8 +61,8 @@
37 */
38
39 /* OpenBIOS defined UART mappings, used before early_serial_setup */
40 -#define UART0_IO_BASE (u8 *) 0xE0000200
41 -#define UART1_IO_BASE (u8 *) 0xE0000300
42 +#define UART0_IO_BASE 0xE0000200
43 +#define UART1_IO_BASE 0xE0000300
44
45 /* external Epson SG-615P */
46 #define BASE_BAUD 691200
47 diff -Nru a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h
48 --- a/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
49 +++ b/arch/ppc/platforms/4xx/luan.h 2005-03-12 22:45:06 -08:00
50 @@ -47,9 +47,9 @@
51 #define RS_TABLE_SIZE 3
52
53 /* PIBS defined UART mappings, used before early_serial_setup */
54 -#define UART0_IO_BASE (u8 *) 0xa0000200
55 -#define UART1_IO_BASE (u8 *) 0xa0000300
56 -#define UART2_IO_BASE (u8 *) 0xa0000600
57 +#define UART0_IO_BASE 0xa0000200
58 +#define UART1_IO_BASE 0xa0000300
59 +#define UART2_IO_BASE 0xa0000600
60
61 #define BASE_BAUD 11059200
62 #define STD_UART_OP(num) \
63 diff -Nru a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h
64 --- a/arch/ppc/platforms/4xx/ocotea.h 2005-03-12 22:45:06 -08:00
65 +++ b/arch/ppc/platforms/4xx/ocotea.h 2005-03-12 22:45:06 -08:00
66 @@ -56,8 +56,8 @@
67 #define RS_TABLE_SIZE 2
68
69 /* OpenBIOS defined UART mappings, used before early_serial_setup */
70 -#define UART0_IO_BASE (u8 *) 0xE0000200
71 -#define UART1_IO_BASE (u8 *) 0xE0000300
72 +#define UART0_IO_BASE 0xE0000200
73 +#define UART1_IO_BASE 0xE0000300
74
75 #define BASE_BAUD 11059200/16
76 #define STD_UART_OP(num) \
77 diff -Nru a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
78 --- a/drivers/char/drm/drm_ioctl.c 2005-03-12 22:45:06 -08:00
79 +++ b/drivers/char/drm/drm_ioctl.c 2005-03-12 22:45:06 -08:00
80 @@ -326,6 +326,8 @@
81
82 DRM_COPY_FROM_USER_IOCTL(sv, argp, sizeof(sv));
83
84 + memset(&version, 0, sizeof(version));
85 +
86 dev->driver->version(&version);
87 retv.drm_di_major = DRM_IF_MAJOR;
88 retv.drm_di_minor = DRM_IF_MINOR;
89 diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
90 --- a/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
91 +++ b/drivers/media/video/adv7170.c 2005-03-12 22:45:06 -08:00
92 @@ -130,7 +130,7 @@
93 u8 block_data[32];
94
95 msg.addr = client->addr;
96 - msg.flags = client->flags;
97 + msg.flags = 0;
98 while (len >= 2) {
99 msg.buf = (char *) block_data;
100 msg.len = 0;
101 diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
102 --- a/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
103 +++ b/drivers/media/video/adv7175.c 2005-03-12 22:45:06 -08:00
104 @@ -126,7 +126,7 @@
105 u8 block_data[32];
106
107 msg.addr = client->addr;
108 - msg.flags = client->flags;
109 + msg.flags = 0;
110 while (len >= 2) {
111 msg.buf = (char *) block_data;
112 msg.len = 0;
113 diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
114 --- a/drivers/media/video/bt819.c 2005-03-12 22:45:06 -08:00
115 +++ b/drivers/media/video/bt819.c 2005-03-12 22:45:06 -08:00
116 @@ -146,7 +146,7 @@
117 u8 block_data[32];
118
119 msg.addr = client->addr;
120 - msg.flags = client->flags;
121 + msg.flags = 0;
122 while (len >= 2) {
123 msg.buf = (char *) block_data;
124 msg.len = 0;
125 diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
126 --- a/drivers/media/video/saa7110.c 2005-03-12 22:45:06 -08:00
127 +++ b/drivers/media/video/saa7110.c 2005-03-12 22:45:06 -08:00
128 @@ -60,8 +60,10 @@
129
130 #define I2C_SAA7110 0x9C /* or 0x9E */
131
132 +#define SAA7110_NR_REG 0x35
133 +
134 struct saa7110 {
135 - unsigned char reg[54];
136 + u8 reg[SAA7110_NR_REG];
137
138 int norm;
139 int input;
140 @@ -95,31 +97,28 @@
141 unsigned int len)
142 {
143 int ret = -1;
144 - u8 reg = *data++;
145 + u8 reg = *data; /* first register to write to */
146
147 - len--;
148 + /* Sanity check */
149 + if (reg + (len - 1) > SAA7110_NR_REG)
150 + return ret;
151
152 /* the saa7110 has an autoincrement function, use it if
153 * the adapter understands raw I2C */
154 if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
155 struct saa7110 *decoder = i2c_get_clientdata(client);
156 struct i2c_msg msg;
157 - u8 block_data[54];
158
159 - msg.len = 0;
160 - msg.buf = (char *) block_data;
161 + msg.len = len;
162 + msg.buf = (char *) data;
163 msg.addr = client->addr;
164 - msg.flags = client->flags;
165 - while (len >= 1) {
166 - msg.len = 0;
167 - block_data[msg.len++] = reg;
168 - while (len-- >= 1 && msg.len < 54)
169 - block_data[msg.len++] =
170 - decoder->reg[reg++] = *data++;
171 - ret = i2c_transfer(client->adapter, &msg, 1);
172 - }
173 + msg.flags = 0;
174 + ret = i2c_transfer(client->adapter, &msg, 1);
175 +
176 + /* Cache the written data */
177 + memcpy(decoder->reg + reg, data + 1, len - 1);
178 } else {
179 - while (len-- >= 1) {
180 + for (++data, --len; len; len--) {
181 if ((ret = saa7110_write(client, reg++,
182 *data++)) < 0)
183 break;
184 @@ -192,7 +191,7 @@
185 return 0;
186 }
187
188 -static const unsigned char initseq[] = {
189 +static const unsigned char initseq[1 + SAA7110_NR_REG] = {
190 0, 0x4C, 0x3C, 0x0D, 0xEF, 0xBD, 0xF2, 0x03, 0x00,
191 /* 0x08 */ 0xF8, 0xF8, 0x60, 0x60, 0x00, 0x86, 0x18, 0x90,
192 /* 0x10 */ 0x00, 0x59, 0x40, 0x46, 0x42, 0x1A, 0xFF, 0xDA,
193 diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
194 --- a/drivers/media/video/saa7114.c 2005-03-12 22:45:06 -08:00
195 +++ b/drivers/media/video/saa7114.c 2005-03-12 22:45:06 -08:00
196 @@ -163,7 +163,7 @@
197 u8 block_data[32];
198
199 msg.addr = client->addr;
200 - msg.flags = client->flags;
201 + msg.flags = 0;
202 while (len >= 2) {
203 msg.buf = (char *) block_data;
204 msg.len = 0;
205 diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
206 --- a/drivers/media/video/saa7185.c 2005-03-12 22:45:06 -08:00
207 +++ b/drivers/media/video/saa7185.c 2005-03-12 22:45:06 -08:00
208 @@ -118,7 +118,7 @@
209 u8 block_data[32];
210
211 msg.addr = client->addr;
212 - msg.flags = client->flags;
213 + msg.flags = 0;
214 while (len >= 2) {
215 msg.buf = (char *) block_data;
216 msg.len = 0;
217 diff -Nru a/drivers/net/r8169.c b/drivers/net/r8169.c
218 --- a/drivers/net/r8169.c 2005-03-12 22:45:06 -08:00
219 +++ b/drivers/net/r8169.c 2005-03-12 22:45:06 -08:00
220 @@ -1683,16 +1683,19 @@
221 rtl8169_make_unusable_by_asic(desc);
222 }
223
224 -static inline void rtl8169_return_to_asic(struct RxDesc *desc, int rx_buf_sz)
225 +static inline void rtl8169_mark_to_asic(struct RxDesc *desc, u32 rx_buf_sz)
226 {
227 - desc->opts1 |= cpu_to_le32(DescOwn + rx_buf_sz);
228 + u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
229 +
230 + desc->opts1 = cpu_to_le32(DescOwn | eor | rx_buf_sz);
231 }
232
233 -static inline void rtl8169_give_to_asic(struct RxDesc *desc, dma_addr_t mapping,
234 - int rx_buf_sz)
235 +static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
236 + u32 rx_buf_sz)
237 {
238 desc->addr = cpu_to_le64(mapping);
239 - desc->opts1 |= cpu_to_le32(DescOwn + rx_buf_sz);
240 + wmb();
241 + rtl8169_mark_to_asic(desc, rx_buf_sz);
242 }
243
244 static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
245 @@ -1712,7 +1715,7 @@
246 mapping = pci_map_single(pdev, skb->tail, rx_buf_sz,
247 PCI_DMA_FROMDEVICE);
248
249 - rtl8169_give_to_asic(desc, mapping, rx_buf_sz);
250 + rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
251
252 out:
253 return ret;
254 @@ -2150,7 +2153,7 @@
255 skb_reserve(skb, NET_IP_ALIGN);
256 eth_copy_and_sum(skb, sk_buff[0]->tail, pkt_size, 0);
257 *sk_buff = skb;
258 - rtl8169_return_to_asic(desc, rx_buf_sz);
259 + rtl8169_mark_to_asic(desc, rx_buf_sz);
260 ret = 0;
261 }
262 }
263 diff -Nru a/drivers/net/sis900.c b/drivers/net/sis900.c
264 --- a/drivers/net/sis900.c 2005-03-12 22:45:06 -08:00
265 +++ b/drivers/net/sis900.c 2005-03-12 22:45:06 -08:00
266 @@ -236,7 +236,7 @@
267 signature = (u16) read_eeprom(ioaddr, EEPROMSignature);
268 if (signature == 0xffff || signature == 0x0000) {
269 printk (KERN_INFO "%s: Error EERPOM read %x\n",
270 - net_dev->name, signature);
271 + pci_name(pci_dev), signature);
272 return 0;
273 }
274
275 @@ -268,7 +268,7 @@
276 if (!isa_bridge)
277 isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0018, isa_bridge);
278 if (!isa_bridge) {
279 - printk("%s: Can not find ISA bridge\n", net_dev->name);
280 + printk("%s: Can not find ISA bridge\n", pci_name(pci_dev));
281 return 0;
282 }
283 pci_read_config_byte(isa_bridge, 0x48, &reg);
284 @@ -456,10 +456,6 @@
285 net_dev->tx_timeout = sis900_tx_timeout;
286 net_dev->watchdog_timeo = TX_TIMEOUT;
287 net_dev->ethtool_ops = &sis900_ethtool_ops;
288 -
289 - ret = register_netdev(net_dev);
290 - if (ret)
291 - goto err_unmap_rx;
292
293 /* Get Mac address according to the chip revision */
294 pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &revision);
295 @@ -476,7 +472,7 @@
296
297 if (ret == 0) {
298 ret = -ENODEV;
299 - goto err_out_unregister;
300 + goto err_unmap_rx;
301 }
302
303 /* 630ET : set the mii access mode as software-mode */
304 @@ -486,7 +482,7 @@
305 /* probe for mii transceiver */
306 if (sis900_mii_probe(net_dev) == 0) {
307 ret = -ENODEV;
308 - goto err_out_unregister;
309 + goto err_unmap_rx;
310 }
311
312 /* save our host bridge revision */
313 @@ -496,6 +492,10 @@
314 pci_dev_put(dev);
315 }
316
317 + ret = register_netdev(net_dev);
318 + if (ret)
319 + goto err_unmap_rx;
320 +
321 /* print some information about our NIC */
322 printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name,
323 card_name, ioaddr, net_dev->irq);
324 @@ -505,8 +505,6 @@
325
326 return 0;
327
328 - err_out_unregister:
329 - unregister_netdev(net_dev);
330 err_unmap_rx:
331 pci_free_consistent(pci_dev, RX_TOTAL_SIZE, sis_priv->rx_ring,
332 sis_priv->rx_ring_dma);
333 @@ -533,6 +531,7 @@
334 static int __init sis900_mii_probe(struct net_device * net_dev)
335 {
336 struct sis900_private * sis_priv = net_dev->priv;
337 + const char *dev_name = pci_name(sis_priv->pci_dev);
338 u16 poll_bit = MII_STAT_LINK, status = 0;
339 unsigned long timeout = jiffies + 5 * HZ;
340 int phy_addr;
341 @@ -582,21 +581,20 @@
342 mii_phy->phy_types =
343 (mii_status & (MII_STAT_CAN_TX_FDX | MII_STAT_CAN_TX)) ? LAN : HOME;
344 printk(KERN_INFO "%s: %s transceiver found at address %d.\n",
345 - net_dev->name, mii_chip_table[i].name,
346 + dev_name, mii_chip_table[i].name,
347 phy_addr);
348 break;
349 }
350
351 if( !mii_chip_table[i].phy_id1 ) {
352 printk(KERN_INFO "%s: Unknown PHY transceiver found at address %d.\n",
353 - net_dev->name, phy_addr);
354 + dev_name, phy_addr);
355 mii_phy->phy_types = UNKNOWN;
356 }
357 }
358
359 if (sis_priv->mii == NULL) {
360 - printk(KERN_INFO "%s: No MII transceivers found!\n",
361 - net_dev->name);
362 + printk(KERN_INFO "%s: No MII transceivers found!\n", dev_name);
363 return 0;
364 }
365
366 @@ -621,7 +619,7 @@
367 poll_bit ^= (mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS) & poll_bit);
368 if (time_after_eq(jiffies, timeout)) {
369 printk(KERN_WARNING "%s: reset phy and link down now\n",
370 - net_dev->name);
371 + dev_name);
372 return -ETIME;
373 }
374 }
375 @@ -691,7 +689,7 @@
376 sis_priv->mii = default_phy;
377 sis_priv->cur_phy = default_phy->phy_addr;
378 printk(KERN_INFO "%s: Using transceiver found at address %d as default\n",
379 - net_dev->name,sis_priv->cur_phy);
380 + pci_name(sis_priv->pci_dev), sis_priv->cur_phy);
381 }
382
383 status = mdio_read(net_dev, sis_priv->cur_phy, MII_CONTROL);
384 diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
385 --- a/drivers/net/via-rhine.c 2005-03-12 22:45:06 -08:00
386 +++ b/drivers/net/via-rhine.c 2005-03-12 22:45:06 -08:00
387 @@ -1899,6 +1899,9 @@
388 struct rhine_private *rp = netdev_priv(dev);
389 void __iomem *ioaddr = rp->base;
390
391 + if (!(rp->quirks & rqWOL))
392 + return; /* Nothing to do for non-WOL adapters */
393 +
394 rhine_power_init(dev);
395
396 /* Make sure we use pattern 0, 1 and not 4, 5 */
397 diff -Nru a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
398 --- a/drivers/pci/hotplug/pciehp_ctrl.c 2005-03-12 22:45:06 -08:00
399 +++ b/drivers/pci/hotplug/pciehp_ctrl.c 2005-03-12 22:45:06 -08:00
400 @@ -1354,10 +1354,11 @@
401 dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n",
402 ctrl->seg, func->bus, func->device, func->function);
403 bridge_slot_remove(func);
404 - } else
405 + } else {
406 dbg("PCI Function Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n",
407 ctrl->seg, func->bus, func->device, func->function);
408 slot_remove(func);
409 + }
410
411 func = pciehp_slot_find(ctrl->slot_bus, device, 0);
412 }
413 diff -Nru a/fs/cramfs/inode.c b/fs/cramfs/inode.c
414 --- a/fs/cramfs/inode.c 2005-03-12 22:45:06 -08:00
415 +++ b/fs/cramfs/inode.c 2005-03-12 22:45:06 -08:00
416 @@ -70,6 +70,7 @@
417 inode->i_data.a_ops = &cramfs_aops;
418 } else {
419 inode->i_size = 0;
420 + inode->i_blocks = 0;
421 init_special_inode(inode, inode->i_mode,
422 old_decode_dev(cramfs_inode->size));
423 }
424 diff -Nru a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
425 --- a/net/ipv4/tcp_timer.c 2005-03-12 22:45:06 -08:00
426 +++ b/net/ipv4/tcp_timer.c 2005-03-12 22:45:06 -08:00
427 @@ -38,6 +38,7 @@
428
429 #ifdef TCP_DEBUG
430 const char tcp_timer_bug_msg[] = KERN_DEBUG "tcpbug: unknown timer value\n";
431 +EXPORT_SYMBOL(tcp_timer_bug_msg);
432 #endif
433
434 /*

  ViewVC Help
Powered by ViewVC 1.1.20