commit b9756c047ce6b60e3b96aa3c5db958acbdacedde tree 734a96bc44fc9d239935934551d7cba4658a1635 parent b54633056d626590f32912540500c8c20ce6d520 parent 778e2ac5970e445f8c6b7d8aa597ac162afe270a author Linus Torvalds Tue, 28 Feb 2006 09:14:09 -0800 committer Linus Torvalds Tue, 28 Feb 2006 09:14:09 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 778e2ac5970e445f8c6b7d8aa597ac162afe270a tree dfaa3d0d2732ca14e256f5801a9d91359b70497d parent 4debe4f963f9135771a8c5bc66e84396201dcfd8 author Ralf Baechle Tue, 28 Feb 2006 17:04:20 +0000 committer Ralf Baechle Tue, 28 Feb 2006 17:04:20 +0000 [MIPS] Fix build error on processors that don's support copy-on-write. Signed-off-by: Ralf Baechle commit 4debe4f963f9135771a8c5bc66e84396201dcfd8 tree 321b4a6e222d7d27e388125b067484a105cb464a parent 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 author Ralf Baechle Mon, 27 Feb 2006 19:05:55 +0000 committer Ralf Baechle Tue, 28 Feb 2006 17:04:19 +0000 [MIPS] Initialize S-cache function pointers even on S-cache-less CPUs. When a CPU has no scache, the scache flushing functions currently aren't getting initialized and the NULL pointer is eventually called as a function. Initialize the scache flushing functions as a noop when there's no scache. Initial patch by me and most of the debugging done by Martin Michlmayr. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit b54633056d626590f32912540500c8c20ce6d520 tree d7c6506b50ff13c215a5d5013ea7feb7777a5ef2 parent 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 parent 56ec6462af9cba56a04439154e5768672d6f390f author Linus Torvalds Tue, 28 Feb 2006 07:38:21 -0800 committer Linus Torvalds Tue, 28 Feb 2006 07:38:21 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 tree 93a65fa0c9e5a10dea118a9594651264f08e58c6 parent a8b76b491510b7591c584838d0d7922f9ffe5c2c author Jens Axboe Tue, 28 Feb 2006 09:35:11 +0100 committer Linus Torvalds Tue, 28 Feb 2006 00:38:02 -0800 [PATCH] cfq-iosched: slice expiry fixups During testing of SLES10, we encountered a hang in the CFQ io scheduler. Turns out the deferred slice expiry logic is buggy, so remove that for now. We could be left with an idle queue that would never wake up. So kill that logic, always expire immediately. Also fix a potential timer race condition. Patch looks bigger than it is, because it moves a function. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 56ec6462af9cba56a04439154e5768672d6f390f tree b2e63269452da95da566d5f675f1f8b277f7f72d parent 273d2803817c9e050e8d6c3c271db7d61f2fb259 author Michael Ellerman Tue, 28 Feb 2006 14:54:26 +1100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:55 +1100 [PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping Before the merge I updated create_pte_mapping() to work for iSeries, by calling iSeries_hpte_bolt_or_insert. (4c55130b2aa93370f1bf52d2304394e91cf8ee39) Later we changed iSeries_hpte_insert to cope with the bolting case, and called that instead from create_pte_mapping() (which was renamed to htab_bolt_mapping) (3c726f8dee6f55e96475574e9f645327e461884c). Unfortunately that change introduced a subtle bug, where we pass an absolute address to iSeries_hpte_insert() where it expects a physical address. This leads to us calling phys_to_abs() twice on the physical address, which is seriously bogus. This only causes a problem if the absolute address from the first translation can be looked up again in the chunk_map, which depends on the size and layout of memory. I've seen it fail on one box, but not others. The minimal fix is to pass the physical address to iSeries_hpte_insert(). For 2.6.17 we should make phys_to_abs() BUG if we try to double-translate an address. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 273d2803817c9e050e8d6c3c271db7d61f2fb259 tree 6ce423e4803571c48de0fd19be1f5be90e69728f parent 634473db86502b6444c3cebd279a06e0b8737527 author Olaf Hering Mon, 27 Feb 2006 15:52:59 +0100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: fix NULL pointer in handle_eeh_events This patch fixes a crash in handle_eeh_events, but ethtool -t still doesnt work right. ... pepino:~ # cpu 0x3: Vector: 300 (Data Access) at [c00000005192bbe0] pc: c00000000004a380: .handle_eeh_events+0xe0/0x23c lr: c00000000004a374: .handle_eeh_events+0xd4/0x23c sp: c00000005192be60 msr: 9000000000009032 dar: 268 dsisr: 40000000 current = 0xc0000001fe7bf1a0 paca = 0xc00000000048b280 pid = 16322, comm = eehd enter ? for help [c00000005192bf00] c00000000004a808 .eeh_event_handler+0xcc/0x130 [c00000005192bf90] c000000000025e00 .kernel_thread+0x4c/0x68 ... (none):/# /usr/sbin/ethtool -i eth0 driver: e100 version: 3.5.10-k2-NAPI firmware-version: N/A bus-info: 0000:21:01.0 (none):/# /usr/sbin/ethtool -t eth0 Call Trace: [C00000000F8DEFF0] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000F8DF0A0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000F8DF150] [C000000000049E58] .eeh_check_failure+0x10c/0x138 [C00000000F8DF1E0] [C0000000002DFDB0] .e100_hw_reset+0x70/0xf4 [C00000000F8DF270] [C0000000002E1BBC] .e100_hw_init+0x2c/0x260 [C00000000F8DF310] [C0000000002E2464] .e100_loopback_test+0x8c/0x220 [C00000000F8DF3C0] [C0000000002E28DC] .e100_diag_test+0xdc/0x16c [C00000000F8DF490] [C000000000420BE0] .dev_ethtool+0xf24/0x14f8 [C00000000F8DF8F0] [C00000000041F4A8] .dev_ioctl+0x5cc/0x740 [C00000000F8DFA20] [C00000000040FEFC] .sock_ioctl+0x3d0/0x404 [C00000000F8DFAC0] [C0000000000D513C] .do_ioctl+0x68/0x108 [C00000000F8DFB50] [C0000000000D56B0] .vfs_ioctl+0x4d4/0x510 [C00000000F8DFC10] [C0000000000D5740] .sys_ioctl+0x54/0x94 [C00000000F8DFCC0] [C0000000000FB6EC] .ethtool_ioctl+0x11c/0x150 [C00000000F8DFD60] [C0000000000F7E40] .compat_sys_ioctl+0x338/0x3bc [C00000000F8DFE30] [C00000000000871C] syscall_exit+0x0/0x40 EEH: Detected PCI bus error on device 0000:21:01.0 EEH: This PCI device has failed 1 times since last reboot: - modprobe: FATAL: Could not load /lib/modules/2.6.16-rc4-git7/modules.dep: No such file or directory Cannot get strings: No such device (none):/# (none):/# EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 (none):/# Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device EEH: This PCI device has failed 1 times since last reboot: - EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device EEH: This PCI device has failed 1 times since last reboot: - EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device and so on Signed-off-by: Olaf Hering Acked-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 634473db86502b6444c3cebd279a06e0b8737527 tree 15b898352bc7fbfbc1a6cc9ef674eef89313dc59 parent 827c1a6c1a5dcb2902fecfb648f9af6a532934eb author Benjamin Herrenschmidt Sun, 26 Feb 2006 08:09:00 +1100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: vdso 64bits gettimeofday bug A bug in the assembly code of the vdso can cause gettimeofday() to hang or to return incorrect results. The wrong register was used to test for pending updates of the calibration variables and to create a dependency for subsequent loads. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 827c1a6c1a5dcb2902fecfb648f9af6a532934eb tree 7cc96f3b3df746dc8569bc1b0bffd47f11084214 parent a8b76b491510b7591c584838d0d7922f9ffe5c2c author John Rose Fri, 24 Feb 2006 11:34:23 -0600 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: fix dynamic PCI probe regression Some hotplug driver functions were migrated to the kernel for use by EEH in commit 2bf6a8fa21570f37fd1789610da30f70a05ac5e3. Previously, the PCI Hotplug module had been changed to use the new OFDT-based PCI probe when appropriate: 5fa80fcdca9d20d30c9ecec30d4dbff4ed93a5c6 When rpaphp_pci_config_slot() was moved from the rpaphp driver to the new kernel function pcibios_add_pci_devices(), the OFDT-based probe stuff was dropped. This patch restores it. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit a8b76b491510b7591c584838d0d7922f9ffe5c2c tree b0d9e8b9c428b59beaf3251db17a54dfc1fd1a11 parent 637029c6cb5efcbaa3d5831af4c1972bdd629779 parent c3c013a2c218cdede2d2e73df01ed4f813538941 author Linus Torvalds Mon, 27 Feb 2006 20:43:36 -0800 committer Linus Torvalds Mon, 27 Feb 2006 20:43:36 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 637029c6cb5efcbaa3d5831af4c1972bdd629779 tree cd6d32dceef73f0ad467f495f51f331a459d01db parent d4f0f122ec407bd1b4d1c773d0c87edc6a92cd26 author Linus Torvalds Mon, 27 Feb 2006 20:41:56 -0800 committer Linus Torvalds Mon, 27 Feb 2006 20:41:56 -0800 Revert "[PATCH] x86_64: Only do the clustered systems have unsynchronized TSC assumption on IBM systems" This reverts commit 13a229abc25640813f1480c0478dfc6bdbc1c19e. Quoth Andi: "After some consideration and feedback from various people it turns out this wasn't that good an idea. It has some problems and needs more work. Since it was only an optimization anyways it's best to just back it out again for now." Signed-off-by: Linus Torvalds commit c3c013a2c218cdede2d2e73df01ed4f813538941 tree 1e7bfa4c687bb54fd328f06ac141937de1bb0470 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Jeff Garzik Mon, 27 Feb 2006 22:31:19 -0500 committer Jeff Garzik Mon, 27 Feb 2006 22:31:19 -0500 [libata] Disable FUA Until problems are sorted. commit d4f0f122ec407bd1b4d1c773d0c87edc6a92cd26 tree d0f99c84737f41d21acdf36f9016707c8c09db20 parent 272a5322d5219b00a1e541ad9d0d76824df1aa2a parent 2353e8e9b6ae29aad77935f21735a30f5cc419b4 author Linus Torvalds Mon, 27 Feb 2006 18:15:43 -0800 committer Linus Torvalds Mon, 27 Feb 2006 18:15:43 -0800 Merge git://oss.sgi.com:8090/oss/git/xfs-rc-fixes commit 2353e8e9b6ae29aad77935f21735a30f5cc419b4 tree 6c3b2b28e1e33ebe26bf12866dccfdeedaf6ea1e parent dae81d4774ecbeb7d24bb9a6a4db9f9baee54d85 author Eric Sandeen Tue, 28 Feb 2006 12:30:30 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:30:30 +1100 [XFS] Don't map non-uptodate buffers in xfs_probe_cluster; also fixes obscure corruption case SGI-PV: 942658 SGI-Modid: xfs-linux-melb:xfs-kern:207119a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit dae81d4774ecbeb7d24bb9a6a4db9f9baee54d85 tree 5166f7d485c833cde45f9b27c3c8bdae2870e69f parent 07ff2fa8fcb3d9207f1c16e5acf9086d5731ed8b author Nathan Scott Tue, 28 Feb 2006 12:30:13 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:30:13 +1100 [XFS] Reduce stack use during quota mounts (caused a panic). This regressed recently via the fix for inherited quota inode attributes. SGI-PV: 947312 SGI-Modid: xfs-linux-melb:xfs-kern:25318a Signed-off-by: Nathan Scott commit 07ff2fa8fcb3d9207f1c16e5acf9086d5731ed8b tree 819bc2fb3e66bbaa91d6164116b96f7c1756d1f8 parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 author Nathan Scott Tue, 28 Feb 2006 12:29:51 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:29:51 +1100 [XFS] Fix a realtime allocator regression introduced by an old iget race fix. Noticed by Roger Willcocks. SGI-PV: 949821 SGI-Modid: xfs-linux-melb:xfs-kern:25257a Signed-off-by: Nathan Scott commit 272a5322d5219b00a1e541ad9d0d76824df1aa2a tree 2d27468bdb6b5c777f19c5aed2dafc2ec8682950 parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 parent ba13c98405ba44d37d148376c6615e6c8babbfdc author Linus Torvalds Mon, 27 Feb 2006 15:22:14 -0800 committer Linus Torvalds Mon, 27 Feb 2006 15:22:14 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit ba13c98405ba44d37d148376c6615e6c8babbfdc tree 34bab6d3ae89637192fea5a7e2a59925804840ee parent bafac2a512bf4fd2ce7520f3976ce8aab4435f74 author Arnaldo Carvalho de Melo Mon, 27 Feb 2006 13:30:43 -0800 committer David S. Miller Mon, 27 Feb 2006 13:30:43 -0800 [REQSK]: Don't reset rskq_defer_accept in reqsk_queue_alloc In 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 I moved defer_accept from tcp_sock to request_queue and mistakingly reset it at reqsl_queue_alloc, causing calls to setsockopt(TCP_DEFER_ACCEPT ) to be lost after bind, the fix is to remove the zeroing of rskq_defer_accept from reqsl_queue_alloc. Thanks to Alexandra N. Kossovsky for reporting and testing the suggested fix. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bafac2a512bf4fd2ce7520f3976ce8aab4435f74 tree ff5c6538eeebceee2b3b5b137d6c66e8d28e77f1 parent 45fe4dc08cbf9510074b97a16606366c1d405f4d author Patrick McHardy Mon, 27 Feb 2006 13:04:17 -0800 committer David S. Miller Mon, 27 Feb 2006 13:04:17 -0800 [NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibility The nfnetlink_log infrastructure changes broke compatiblity of the LOG targets. They currently use whatever log backend was registered first, which means that if ipt_ULOG was loaded first, no messages will be printed to the ring buffer anymore. Restore compatiblity by using the old log functions by default and only use the nf_log backend if the user explicitly said so. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 45fe4dc08cbf9510074b97a16606366c1d405f4d tree 2c629e31e03d62e84c375ad809861806a02840e0 parent e121e9ecb08c3a9843243f461290869ff08be900 author Patrick McHardy Mon, 27 Feb 2006 13:03:55 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:55 -0800 [NETFILTER]: nf_queue: fix end-of-list check The comparison wants to find out if the last list iteration reached the end of the list. It needs to compare the iterator with the list head to do this, not the element it is looking for. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e121e9ecb08c3a9843243f461290869ff08be900 tree 9574002aa4dfffafe16512460f12ef5c79486537 parent 7a11b9848ae27e571f219fab5541bd84700f0d68 author Patrick McHardy Mon, 27 Feb 2006 13:03:39 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:39 -0800 [NETFILTER]: nf_queue: remove unnecessary check for outfn The only point of registering a queue handler is to provide an outfn, so there is no need to check for it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7a11b9848ae27e571f219fab5541bd84700f0d68 tree cd108f9df88ac218c8d9dab3fbda389df92f8d44 parent f92f871989c97a24d284ac60b0f880222ddf87ac author Patrick McHardy Mon, 27 Feb 2006 13:03:24 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:24 -0800 [NETFILTER]: nf_queue: fix rerouting after packet mangling Packets should be rerouted when they come back from userspace, not before. Also move the queue_rerouters to RCU to avoid taking the queue_handler_lock for each reinjected packet. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f92f871989c97a24d284ac60b0f880222ddf87ac tree 8b9232f0e789dd0769b7025d773e6f2346ff5e95 parent e02f7d1603c955126e88cc08149509d00be25cb9 author Patrick McHardy Mon, 27 Feb 2006 13:03:10 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:10 -0800 [NETFILTER]: nf_queue: check if rerouter is present before using it Every rerouter needs to provide a save and a reroute function, we don't need to check for them. But we do need to check if a rerouter is registered at all for the current family, with bridging for example packets of unregistered families can hit nf_queue. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e02f7d1603c955126e88cc08149509d00be25cb9 tree ebd48da4b8cc55fb8070af70139e62e77a6f423c parent 752c1f4c78fe86d0fd6497387f763306b0d8fc53 author Patrick McHardy Mon, 27 Feb 2006 13:02:52 -0800 committer David S. Miller Mon, 27 Feb 2006 13:02:52 -0800 [NETFILTER]: nf_queue: don't copy registered rerouter data Use the registered data structure instead of copying it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 752c1f4c78fe86d0fd6497387f763306b0d8fc53 tree 50d7e52940d1adf0936805645d52e2419e5922cf parent 4bf05eceecf2efb4c883e9e9b17825682e7330dd author Herbert Xu Mon, 27 Feb 2006 13:00:40 -0800 committer David S. Miller Mon, 27 Feb 2006 13:00:40 -0800 [IPSEC]: Kill post_input hook and do NAT-T in esp_input directly The only reason post_input exists at all is that it gives us the potential to adjust the checksums incrementally in future which we ought to do. However, after thinking about it for a bit we can adjust the checksums without using this post_input stuff at all. The crucial point is that only the inner-most NAT-T SA needs to be considered when adjusting checksums. What's more, the checksum adjustment comes down to a single u32 due to the linearity of IP checksums. We just happen to have a spare u32 lying around in our skb structure :) When ip_summed is set to CHECKSUM_NONE on input, the value of skb->csum is currently unused. All we have to do is to make that the checksum adjustment and voila, there goes all the post_input and decap structures! I've left in the decap data structures for now since it's intricately woven into the sec_path stuff. We can kill them later too. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4bf05eceecf2efb4c883e9e9b17825682e7330dd tree 0cbd4b8a8b972220e97c88aadbee0661b0e88747 parent de5f503cfbe4f942492269c6bd97a16a4d61e488 author Herbert Xu Mon, 27 Feb 2006 13:00:01 -0800 committer David S. Miller Mon, 27 Feb 2006 13:00:01 -0800 [IPSEC] esp: Kill unnecessary block and indentation We used to keep sg on the stack which is why the extra block was useful. We've long since stopped doing that so let's kill the block and save some indentation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 051d3cbd96909b2fe6b5038e7bbe77f41356db05 tree 6decc4a2a4f1c3df66df5d78602ab8b4f971375d parent de5f503cfbe4f942492269c6bd97a16a4d61e488 author David S. Miller Mon, 27 Feb 2006 12:51:27 -0800 committer David S. Miller Mon, 27 Feb 2006 12:51:27 -0800 [TG3]: Fix Sun tg3 variant detection. Some Sun parts don't have PCI_VENDOR_ID_SUN in the subsystem vendor ID. So add another fallback test, which is the name of the OBP firmware device tree node. If it's a Sun part we'll get "network", else it will be named "ethernet". Signed-off-by: David S. Miller commit de5f503cfbe4f942492269c6bd97a16a4d61e488 tree 680d9c6624c9cad72e4654dd6c986f6ea4df21ac parent d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 parent 2fd628fe25e1f3d07996b0dab728ea0702f81306 author Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 committer Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 2fd628fe25e1f3d07996b0dab728ea0702f81306 tree f57882e33f96141ba59f8f188e8797adb40e42b0 parent 92f22c183cd669c8575767fede8fe43bb4f7bce9 author Atsushi Nemoto Tue, 21 Feb 2006 15:59:00 +0900 committer Ralf Baechle Mon, 27 Feb 2006 17:30:37 +0000 [MIPS] Use generic compat routines for readdir, getdents Not just cleanup but also fixes O32 readdir(2) emulation. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 92f22c183cd669c8575767fede8fe43bb4f7bce9 tree df4aae80db1218a8fab613689e99acf96f18f417 parent 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 author Ralf Baechle Thu, 23 Feb 2006 14:10:53 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] Fix atomic*_sub_if_positive return value. Reported and initial fix by Thomas Koeller , rewritten by me. Signed-off-by: Ralf Baechle commit 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 tree 62ba9475530c88ccf2149cd58eabd97ebe096aca parent 3e6cb2d38a9c9758170813497a860c64543643d5 author Ralf Baechle Thu, 23 Feb 2006 12:23:27 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] SMP: Fix initialization order bug. A recent change requires cpu_possible_map to be initialized before smp_sched_init() but most MIPS platforms were initializing their processors in the prom_prepare_cpus callback of smp_prepare_cpus. The simple fix of calling prom_prepare_cpus from one of the earlier SMP initialization hooks doesn't work well either since IPIs may require init_IRQ() to have completed, so bit the bullet and split prom_prepare_cpus into two initialization functions, plat_smp_setup which is called early from setup_arch and plat_prepare_cpus called where prom_prepare_cpus used to be called. Signed-off-by: Ralf Baechle commit 3e6cb2d38a9c9758170813497a860c64543643d5 tree 8d1d8f075b516c475c0fae5669a1ead536b1ad51 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Ralf Baechle Tue, 21 Feb 2006 18:32:14 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:35 +0000 [MIPS] Use "=R" constraint to avoid compiler errors in cmpxchg(). Signed-off-by: Ralf Baechle commit d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 tree e872c4fcbbf661cccd40d5c414801544c5ef8a5c parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Marc Zyngier Mon, 27 Feb 2006 12:08:00 +0100 committer Linus Torvalds Mon, 27 Feb 2006 08:18:04 -0800 [PATCH] Fix Specialix SX corruption With the latest kernels, I experienced some strange corruption, some '*****' being randomly inserted in the character flow, like this: ashes:~# ashes:~# a*******shes:~# ashes:~# ashes:~# Further investigation shows that the problem was introduced during Alan's "TTY layer buffering revamp" patch, the amount of data to be copied being reduced after buffer allocation. Moving the count fixup around solves the problem. Signed-off-by: Marc Zyngier Approved-by: Rogier Wolff Signed-off-by: Linus Torvalds commit e95a9ec1bb66e07b138861c743192f06e7b3e4de tree 8ee8b2c5339af31f9f79423b3c503f30e0651e4a parent 6d6585e490d985d421d7cd3cfc7d77b618c44130 parent e4e10e3e7995f5bd481d2720bf30d3a661d110ca author Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 6d6585e490d985d421d7cd3cfc7d77b618c44130 tree bf8c941eec540f0e30a37252be031c5504a24e16 parent b9a33cebac70d6f67a769ce8d4078fee2b254ada parent 7bef4b397874eee4484457040e8a1013361d7758 author Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 7bef4b397874eee4484457040e8a1013361d7758 tree 9a13e891ade50d32806ad303b80526bef9b9df3f parent a0124d780d06db711e8a92135d774940588a27da author Daniele Venzano Sat, 25 Feb 2006 17:01:09 -0500 committer Jeff Garzik Sat, 25 Feb 2006 17:01:09 -0500 Fix Wake on LAN support in sis900 Fix two bugs in the WoL implementation of sis900. The first causes hangs on some system on driver load, the second causes troubles when disabling WoL support. Both fixes are one liner and really simple. Signed-off-by: Lennert Buytenhek Signed-off-by: Daniele Venzano commit e4e10e3e7995f5bd481d2720bf30d3a661d110ca tree 14dbbab4fcc8c2fd10376751516c2f0088459247 parent 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: implement R_ERR on DMA activate FIS errata fix Silicon Image has disclosed a new sil3114/3152 errata and workaround which causes the controller to return R_ERR on DMA activate FIS if the FIS is received while the next PRD is being fetched. This patch implements the workaround. This errata results in lock up and doesn't trigger if m15w workaround is in effect. We stopped applying m15w to 3512 and 3114 in 2.6.14-rc1 which makes 3512/3114 lock up with some drives on all kernel versions since 2.6.14-rc1 upto now (2.6.16-rc4). This patch should fix the regression. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 tree f3f7924305c78b714e671e8525de5c1eb02dd268 parent a0124d780d06db711e8a92135d774940588a27da author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: add board ID for 3512 3512 is slightly different from 3112 errata-wise. Differentiate it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik