commit 3eb215de26e6e94bf5fed9cb77230c383b30e53b Author: Dmitry Torokhov Date: Sun Oct 7 12:22:21 2007 -0400 Driver core: fix SYSF_DEPRECATED breakage for nested classdevs We should only reparent to a class former class devices that form the base of class hierarchy. Nested devices should still grow from their real parents. Signed-off-by: Dmitry Torokhov Tested-by: Andrey Borzenkov Tested-by: Anssi Hannula Signed-off-by: Linus Torvalds commit 85923b124624eb49ebef4731bb6b5670e792ff57 Merge: 9d9b7ad... a1134dd... Author: Linus Torvalds Date: Sun Oct 7 16:41:09 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: point to migration document commit 9d9b7ad717474636dc961e6c321970fd799e1cb3 Author: Attila Kinali Date: Sun Oct 7 00:24:38 2007 -0700 Add manufacturer and card id of teltonica pcmcia modems Add the manufacturer and card id of teltonica pcmcia modems to serial_cs.c Signed-off-by: Attila Kinali Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfb0042d43d4e7664f7e3af1b51c9b08175483a6 Author: Pavel Machek Date: Sun Oct 7 00:24:37 2007 -0700 sysrq docs: document sequence that actually works Document sequence of keypresses that actually works. Yes, this changed year-or-so ago. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 291041e935e6d0513f2b7e4a300aa9f02ec1d925 Author: Al Viro Date: Sun Oct 7 00:24:36 2007 -0700 fix bogus reporting of signals by audit Async signals should not be reported as sent by current in audit log. As it is, we call audit_signal_info() too early in check_kill_permission(). Note that check_kill_permission() has that test already - it needs to know if it should apply current-based permission checks. So the solution is to move the call of audit_signal_info() between those. Bogosity in question is easily reproduced - add a rule watching for e.g. kill(2) from specific process (so that audit_signal_info() would not short-circuit to nothing), say load_policy, watch the bogus OBJ_PID entry in audit logs claiming that write(2) on selinuxfs file issued by load_policy(8) had somehow managed to send a signal to syslogd... Signed-off-by: Al Viro Acked-by: Steve Grubb Acked-by: Eric Paris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a5c5d5735e785a700a377a5fce913b8ad45a58f Author: Alexey Dobriyan Date: Sun Oct 7 00:24:34 2007 -0700 Move kasprintf.o to obj-y Modulat lguest started giving linking errors MODPOST 1 modules ERROR: "kasprintf" [drivers/lguest/lg.ko] undefined! Signed-off-by: Alexey Dobriyan Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a560aa48eed66fdf78f2a2813ab7b4ca766a84ce Author: Peter Zijlstra Date: Sun Oct 7 00:24:33 2007 -0700 lockstat: documentation Provide some documentation for CONFIG_LOCK_STAT. Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Cc: "Randy.Dunlap" Cc: Rob Landley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a2638bff063acb28ba3355891c49cc240cc98b Author: Rafal Bilski Date: Sun Oct 7 00:24:32 2007 -0700 Longhaul: add auto enabled "revid_errata" option VIA C3 Ezra-T has RevisionID equal to 1, but it needs RevisionKey to be 0 or CPU will ignore new frequency and will continue to work at old frequency. New "revid_errata" option will force RevisionKey to be set to 0, whatever RevisionID is. Additionaly "Longhaul" will not silently ignore unsuccessful transition. It will try to check if "revid_errata" or "disable_acpi_c3" options need to be enabled for this processor/system. Same for Longhaul ver. 2 support. It will be disabled if none of above options will work. Best case scenario (with patch apllied and v2 enabled): longhaul: VIA C3 'Ezra' [C5C] CPU detected. Longhaul v2 supported. longhaul: Using northbridge support. longhaul: VRM 8.5 longhaul: Max VID=1.350 Min VID=1.050, 13 possible voltage scales longhaul: f: 300000 kHz, index: 0, vid: 1050 mV [...] longhaul: Voltage scaling enabled. Worst case scenario: longhaul: VIA C3 'Ezra-T' [C5M] CPU detected. Powersaver supported. longhaul: Using northbridge support. longhaul: Using ACPI support. longhaul: VRM 8.5 longhaul: Claims to support voltage scaling but min & max are both 1.250. Voltage scaling disabled longhaul: Failed to set requested frequency! longhaul: Enabling "Ignore Revision ID" option. longhaul: Failed to set requested frequency! longhaul: Disabling ACPI C3 support. longhaul: Disabling "Ignore Revision ID" option. longhaul: Failed to set requested frequency! longhaul: Enabling "Ignore Revision ID" option. [akpm@linux-foundation.org: coding-style cleanups] Signed-off-by: Rafal Bilski Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74922be1485818ed368c4cf4f0b100f70bf01e08 Author: Anton Blanchard Date: Sun Oct 7 00:24:31 2007 -0700 Fix timer_stats printout of events/sec When using /proc/timer_stats on ppc64 I noticed the events/sec field wasnt accurate. Sometimes the integer part was incorrect due to rounding (we werent taking the fractional seconds into consideration). The fraction part is also wrong, we need to pad the printf statement and take the bottom three digits of 1000 times the value. Signed-off-by: Anton Blanchard Acked-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c2043abefacac97b6d01129c1123a466c95b7c1 Author: Linus Torvalds Date: Sun Oct 7 16:17:38 2007 -0700 Don't do load-average calculations at even 5-second intervals It turns out that there are a few other five-second timers in the kernel, and if the timers get in sync, the load-average can get artificially inflated by events that just happen to coincide. So just offset the load average calculation it by a timer tick. Noticed by Anders Boström, for whom the coincidence started triggering on one of his machines with the JBD jiffies rounding code (JBD is one of the subsystems that also end up using a 5-second timer by default). Tested-by: Anders Boström Cc: Chuck Ebbert Cc: Arjan van de Ven Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 70cb97935b8859f27296772885104b599f560576 Author: Linus Torvalds Date: Sun Oct 7 16:02:55 2007 -0700 VT_WAITACTIVE: Avoid returning EINTR when not necessary We should generally prefer to return ERESTARTNOHAND rather than EINTR, so that processes with unhandled signals that get ignored don't return EINTR. This can help with X startup issues: Fatal server error: xf86OpenConsole: VT_WAITACTIVE failed: Interrupted system call although the real fix is having the X server always retry EINTR regardless (since EINTR does happen for signals that have handlers installed). Keithp has a patch for that. Regardless, ERESTARTNOHAND is the correct thing to use. Signed-off-by: Linus Torvalds commit a1134dd48d59e532b801659163539bf01cae7673 Author: Stefan Richter Date: Sun Oct 7 12:31:22 2007 +0200 firewire: point to migration document Signed-off-by: Stefan Richter commit fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68 Merge: 3a49869... 8cfaf45... Author: Linus Torvalds Date: Sat Oct 6 15:47:16 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] IP32: Enable PCI bridges commit 3a4986955c0d9806e96a9d738ef7c40cb0cdaba3 Author: Kyle McMartin Date: Sat Oct 6 01:42:34 2007 -0400 Revert "intel_agp: fix stolen mem range on G33" This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which breaks horribly if you aren't running an unreleased xf86-video-intel driver out of git. Signed-off-by: Kyle McMartin Cc: Dave Airlie Cc: Zhenyu Wang Acked-by: Keith Packard Signed-off-by: Linus Torvalds commit 71e4eda8ce698178ee448ff82bdc5803c77a736d Author: Benjamin Herrenschmidt Date: Sat Oct 6 18:52:27 2007 +1000 Fix non-terminated PCI match table in PowerMac IDE The PCI device table in the powermac IDE driver isn't properly terminated. Depending on how your kernel is linked and other random factors, you can end up with this driver matched against any other PCI device in your system, possibly crashing at boot. Thanks to Heikki for tracking this down with me, the bug have been there for some time, though it rarely hurts due to luck. In this case, the switch from .22 to .23-rc9 is causing it to show up due to differences in the resulting layout of .data I suppose. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Bartlomiej Zolnierkiewicz Cc: Heikki Lindholm Signed-off-by: Linus Torvalds commit 67dd5a25f4efbfccf973159429cb20acdc5b0e0e Author: Jeremy Fitzhardinge Date: Fri Oct 5 17:19:35 2007 -0700 xen: disable split pte locks for now When pinning and unpinning pagetables, we must protect them against being used by other CPUs, lest they see the pagetable in an intermediate read-only-but-not-pinned state. When using split pte locks, doing this properly would require taking all the pte locks for the pagetable while pinning, but this may overflow the PREEMPT_BITS part of the preempt counter if the process has mapped more than about 512M of memory. However, failing to take the pte locks causes write-protect faults when the pageout code is trying to clear the Access bit on a pte which is part of a freshy created and still being pinned process after fork. This is a short-term fix until the problem is solved properly. Signed-off-by: Jeremy Fitzhardinge Acked-by: Rik van Riel Acked-by: Hugh Dickins Cc: David Rientjes Cc: Andrew Morton Cc: Andi Kleen Cc: Keir Fraser Cc: Jan Beulich Signed-off-by: Linus Torvalds commit 9f34073b4e54ad58541e0e2b4a87f4f6c1460e21 Merge: c946b30... 4afcdda... Author: Linus Torvalds Date: Fri Oct 5 14:09:10 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend [ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend commit 4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a Author: Ben Dooks Date: Thu Oct 4 23:18:08 2007 +0100 [ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend Ensure nRSTOUT is not asserted during or on resume. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 28047eced817b3b7cd404fac4b26f29fcf04f1f7 Author: Ben Dooks Date: Thu Oct 4 23:16:42 2007 +0100 [ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend Ensure that CPLD is restored to the original state on resume, and that before going into suspend we select the NAND bank we booted from for restarting. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c946b3047205d7e107be16885bbb42ab9f10350a Author: Francois Romieu Date: Thu Oct 4 00:42:50 2007 +0200 r8169: revert part of 6dccd16b7c2703e8bbf8bca62b5cf248332afbe2 The 8169/8110SC currently announces itself as: [...] eth0: RTL8169sc/8110sc at 0x........, ..:..:..:..:..:.., XID 18000000 IRQ .. ^^^^^^^^ It uses RTL_GIGA_MAC_VER_05 and this part of the changeset can cut its performance by a factor of 2~2.5 as reported by Timo. (the driver includes code just before the hunk to write the ChipCmd register when mac_version == RTL_GIGA_MAC_VER_0[1-4]) Signed-off-by: Francois Romieu Cc: Timo Jantunen Signed-off-by: Jeff Garzik commit af299901efac5ede381e01448a31a560a4eca853 Merge: 4ecbca8... b2b2775... Author: Linus Torvalds Date: Fri Oct 5 08:08:08 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix 'niu' complex IRQ probing. [SPARC64]: check fork_idle() error [SPARC64]: Temporary workaround for PCI-E slot on T1000. [SPARC64]: VIO device addition log message level is too high. [SPARC64]: Fix domain-services port probing. [SPARC64]: Don't use in/local regs for ldx/stx data in N1 memcpy. commit 4ecbca8554d0f643351ee07d3284138a5e85ba81 Author: Serge Belyshev Date: Thu Oct 4 23:10:04 2007 +0200 Remove unnecessary cast in prefetch() It is ok to call prefetch() function with NULL argument, as specifically commented in include/linux/prefetch.h. But in standard C, it is invalid to dereference NULL pointer (see C99 standard 6.5.3.2 paragraph 4 and note #84). prefetch() has a memory reference for its argument. Newer gcc versions (4.3 and above) will use that to conclude that "x" argument is non-null and thus wreaking havok everywhere prefetch() was inlined. Fixed by removing cast and changing asm constraint. [ It seems in theory gcc 4.2 could miscompile this too; although no cases known. In 2.6.24 we should probably switch to __builtin_prefetch() instead, but this is a simpler fix for now. -- AK ] Signed-off-by: Serge Belyshev Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8cfaf45367d41400ce99e1757ab5690d1fc94dbc Author: Giuseppe Sacco Date: Thu Oct 4 23:09:12 2007 +0200 [MIPS] IP32: Enable PCI bridges Fixe MACE PCI addressing by adding the bus number parameter. Remove check of the used slot since every slot should be valid. Converted mkaddr from #define to inline function. Signed-off-by: Giuseppe Sacco Signed-off-by: Ralf Baechle commit b2b27757b6f0e88e30f10c431c763523dd7858ca Author: David S. Miller Date: Thu Oct 4 15:03:35 2007 -0700 [SPARC64]: Fix 'niu' complex IRQ probing. They should be computed the same as how we compute them under 'virtual-devices'. Signed-off-by: David S. Miller commit 1177bf9704a4e4e127b961950d75ca6c94fb419b Author: Akinobu Mita Date: Thu Oct 4 14:55:59 2007 -0700 [SPARC64]: check fork_idle() error Check the return value of fork_idle() to catch error. Signed-off-by: Akinobu Mita Signed-off-by: David S. Miller commit 9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3 Merge: 16abfa0... d5e8938... Author: Linus Torvalds Date: Thu Oct 4 10:29:19 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] megaraid_old: fix READ_CAPACITY commit 16abfa086096895d438b19198e408ee96da7b508 Author: Hugh Dickins Date: Thu Oct 4 16:56:06 2007 +0100 Fix sys_remap_file_pages BUG at highmem.c:15! Gurudas Pai reports kernel BUG at arch/i386/mm/highmem.c:15! below sys_remap_file_pages, while running Oracle database test on x86 in 6GB RAM: kunmap thinks we're in_interrupt because the preempt count has wrapped. That's because __do_fault expected to unmap page_table, but one of its two callers do_nonlinear_fault already unmapped it: let do_linear_fault unmap it first too, and then there's no need to pass the page_table arg down. Why have we been so slow to notice this? Probably through forgetting that the mapping_cap_account_dirty test means that sys_remap_file_pages nowadays only goes the full nonlinear vma route on a few memory-backed filesystems like ramfs, tmpfs and hugetlbfs. [ It also depends on CONFIG_HIGHPTE, so it becomes even harder to trigger in practice. Many who have need of large memory have probably migrated to x86-64.. Problem introduced by commit d0217ac04ca6591841e5665f518e38064f4e65bd ("mm: fault feedback #1") -- Linus ] Signed-off-by: Hugh Dickins Cc: gurudas pai Cc: Nick Piggin Cc: Andrew Morton Signed-off-by: Linus Torvalds commit d5e89385e92a77b2764d9eb8284808a7628cb2a8 Author: FUJITA Tomonori Date: Wed Oct 3 09:00:58 2007 +0900 [SCSI] megaraid_old: fix READ_CAPACITY The bulk transfer mode got eleminated by 3f6270ef76f2ce5c134615a470685d6c2a66c07e. Unfortunately, this mode is required for READ_CAPACITY commands on certain cards, so put it back again. This fixes a boot failure regression reported by Burton Windle. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 27097ef9ff219c81a023911c7b0d5e7bc2419177 Author: David S. Miller Date: Wed Oct 3 21:37:57 2007 -0700 [SPARC64]: Temporary workaround for PCI-E slot on T1000. The PCI-E slot on T1000 connects directly to the Fire PCI chip with no intervening bridges visible in the OBP tree. Unfortunately the bus numbering of the device in that slot is different (2) from the PCI host controller (0), and thus the pci_bus_{read,write}_config_*() calls don't work out. Complicating things further the Fire PCI controller has no config space it responds to either. For now treat this case specially so that devices in the slot work. Longer term we need to perhaps cons up a dummy bridge between the Fire and the PCI-E slot so that the bus hierarchy is complete inside of the kernel and thus the bus numbering all works out right. Signed-off-by: David S. Miller commit e2fd58d06f79b10cad22240a6e6fb1c1108aa0ee Author: David S. Miller Date: Wed Oct 3 21:23:40 2007 -0700 [SPARC64]: VIO device addition log message level is too high. There is no reason this should be KERN_ERR, KERN_INFO is just fine. Signed-off-by: David S. Miller commit 07607c5492f836923c2ab9eb1cd1d39be7dace49 Author: David S. Miller Date: Wed Oct 3 21:08:11 2007 -0700 [SPARC64]: Fix domain-services port probing. We should only use ports underneath "domain-services", other DS ports in the MDESC aren't for us to use. Signed-off-by: David S. Miller commit 804b3f9a16e446cb023417faec58b6506c834052 Merge: 3e0ca2f... 991bf52... Author: Linus Torvalds Date: Wed Oct 3 15:44:10 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Ata: pata_marvell, use ioread* for iomap-ped memory libata: fix for sata_mv >64KB DMA segments commit 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 Merge: c7659e2... 529d303... Author: Linus Torvalds Date: Wed Oct 3 15:43:36 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: sky2: jumbo frame regression fix [PATCH] softmac: Fix compiler-warning [PATCH] bcm43xx: Correct printk with PFX before KERN_ commit c7659e2c139d0be4647bef89188a932e0254d709 Merge: 66b1f1a... 9ea0f04... Author: Linus Torvalds Date: Wed Oct 3 15:43:17 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Terminally fix local_{dec,sub}_if_positive [MIPS] Type proof reimplementation of cmpxchg. [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround commit 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 Merge: bda0233... cda6a20... Author: Linus Torvalds Date: Wed Oct 3 15:34:07 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver Blackfin arch: add some missing syscall binfmt_flat: checkpatch fixing minimum support for the blackfin relocations Binfmt_flat: Add minimum support for the Blackfin relocations commit 991bf528f602882580d0918842b125255d246a19 Author: Scott Thompson Date: Tue Oct 2 13:53:01 2007 -0700 drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Add missing ioremap return checks. Signed-off-by: Scott Thompson hushmail.com> Acked-by: Tejun Heo Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 90925d3050253ff7b4f5d1660071df75f44bd0ff Author: Jiri Slaby Date: Tue Oct 2 13:53:01 2007 -0700 Ata: pata_marvell, use ioread* for iomap-ped memory pata_marvell, use ioread* for iomap-ped memory read* on pci_iomapped memory is incorrect, fix it Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4007b493ee6e4a52c2b618ab8361847fba5bf116 Author: Olof Johansson Date: Tue Oct 2 20:45:27 2007 -0500 libata: fix for sata_mv >64KB DMA segments Fix bug in sata_mv for cases where the IOMMU layer has merged SG entries to larger than 64KB. They need to be split up before being sent to the driver. Just for simplicity's sake, split up at 64K boundary instead of 64K size, since that's what the common code does anyway. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit bda0233b89c10ae46ccecb78bffdaf0fd7833d17 Author: Sunil Mushran Date: Fri Sep 21 11:41:43 2007 -0700 ocfs2: Unlock mutex in local alloc failure case The fs was not unlocking the local alloc inode mutex in the code path in which it failed to find a window of free bits in the global bitmap. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 529d303e075aa6d988f30935b8995ffb382ad38e Author: Stephen Hemminger Date: Tue Oct 2 18:02:09 2007 -0700 sky2: jumbo frame regression fix Remove unneeded check that caused problems with jumbo frame sizes. The check was recently added and is wrong. When using jumbo frames the sky2 driver does fragmentation, so rx_data_size is less than mtu. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5c55c434917429f229a1bf43def97fd421f444c6 Merge: f778089... ee0a816... Author: Jeff Garzik Date: Wed Oct 3 13:39:16 2007 -0400 Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit cda6a20b68c1f21f4b4bc9cd3ee08494e7ebf0d5 Author: Michael Hennerich Date: Thu Oct 4 00:36:18 2007 +0800 Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki Cc: Kalle Pokki Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit c58c2140f08de4ad0b0dbd48f6e78168dc321042 Author: Michael Hennerich Date: Thu Oct 4 00:35:05 2007 +0800 Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 9ea0f043fec38fadb0101fbf29563a5635f42e93 Author: Ralf Baechle Date: Wed Oct 3 14:29:19 2007 +0100 [MIPS] Terminally fix local_{dec,sub}_if_positive They contain 64-bit instructions so wouldn't work on 32-bit kernels or 32-bit hardware. Since there are no users, blow them away. They probably were only ever created because there are atomic_sub_if_positive and atomic_dec_if_positive which exist only for sake of semaphores. Signed-off-by: Ralf Baechle commit fef74705ea310acd716c2722bfeb0f796cf23640 Author: Ralf Baechle Date: Mon Oct 1 04:15:00 2007 +0100 [MIPS] Type proof reimplementation of cmpxchg. Signed-off-by: Ralf Baechle commit f6a9e6dec537dc1d9d2c62d7b8ad205d0993bddc Author: Maciej W. Rozycki Date: Tue Oct 2 14:47:22 2007 +0100 [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround Restore a load from KSEG1 done as a workaround for an R4600 v2 erratum, dropped with 211be16de99a7424e66c0b6c0d00e2c970508ac2. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit ee0a8169b693e1c708d0f9af0a5e4ade65a65439 Author: Richard Knutsson Date: Mon Oct 1 02:24:38 2007 +0200 [PATCH] softmac: Fix compiler-warning CC net/ieee80211/softmac/ieee80211softmac_wx.o /home/kernel/src/net/ieee80211/softmac/ieee80211softmac_wx.c: In function ‘ieee80211softmac_wx_set_essid’: /home/kernel/src/net/ieee80211/softmac/ieee80211softmac_wx.c:117: warning: label ‘out’ defined but not used due to commit: efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb. Removing the label. Signed-off-by: Richard Knutsson Signed-off-by: John W. Linville commit a4aa2e867c5d696c0f249ad8d63d0d983b4ffaf9 Author: David S. Miller Date: Tue Oct 2 16:17:17 2007 -0700 [SPARC64]: Don't use in/local regs for ldx/stx data in N1 memcpy. It doesn't matter for use in 64-bit objects, but when used in 32-bit environments the top 32-bits of the local and in registers will get chopped off on the next register window spill/restore which leads to difficult to track down and subtle bugs. Signed-off-by: David S. Miller commit 4365e99f9587b94010e9818a4237ce2b1c734e91 Author: Joe Perches Date: Tue Oct 2 12:57:11 2007 -0700 [PATCH] bcm43xx: Correct printk with PFX before KERN_ Correct printk with PFX before KERN_ in bcm43xx_wx.c Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit f778089cb2445dfc6dfd30a7a567925fd8589f1e Merge: db7a89d... d136552... Author: Linus Torvalds Date: Tue Oct 2 10:41:06 2007 -0700 Merge branch 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: aic94xx: fix DMA data direction for SMP requests commit db7a89db5e3bc6ba131965183577b15fd6fc92cc Merge: 2910ca6... f662fe5... Author: Linus Torvalds Date: Tue Oct 2 10:40:40 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: dm9601: Fix receive MTU mv643xx_eth: Do not modify struct netdev tx_queue_len qla3xxx: bugfix: Fix VLAN rx completion handling. qla3xxx: bugfix: Add memory barrier before accessing rx completion. commit 2910ca6f8ae69648623b3c05b79be87dd7bda73d Merge: d237098... 4c74d4e... Author: Linus Torvalds Date: Tue Oct 2 10:40:20 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata_piix: add another TECRA M3 entry to broken suspend list commit d237098c03eb91cef240e9a1b248c0e1ecd1c80c Merge: 114d5b1... 30084fb... Author: Linus Torvalds Date: Tue Oct 2 10:38:13 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix profile=sleep commit 114d5b1ca265f8a582dcbf0030da20ccdddbe8e1 Merge: 2b3b290... 25e5566... Author: Linus Torvalds Date: Tue Oct 2 10:35:28 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy. [SPARC64]: Fix put_user() calls in binfmt_aout32.c [SPARC]: Fix EBUS use of uninitialized variable. commit 2b3b29080d702e5488f214276170ab46adc40ee5 Merge: e80eaf9... 04045f9... Author: Linus Torvalds Date: Tue Oct 2 10:34:49 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IEEE80211]: avoid integer underflow for runt rx frames [TCP]: secure_tcp_sequence_number() should not use a too fast clock [SFQ]: Remove artificial limitation for queue limit. commit e80eaf9904d5b19512265e1435372b2e12146a5f Merge: 3146b39... e48395f... Author: Linus Torvalds Date: Tue Oct 2 10:33:49 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix xics set_affinity code commit d136552e8beadcf5e59089292e2ba44f09e3aad8 Author: Jeff Garzik Date: Tue Oct 2 13:16:10 2007 -0400 aic94xx: fix DMA data direction for SMP requests DMA-mapped SMP (scsi management protocol) requests going /to/ the device need the PCI DMA data direction to indicate such. Signed-off-by: Jeff Garzik commit f662fe5a0b144efadbfc00e8040e603ec318746e Author: Peter Korsgaard Date: Mon Oct 1 13:36:07 2007 +0200 dm9601: Fix receive MTU dm9601 didn't take the ethernet header into account when calculating RX MTU, causing packets bigger than 1486 to fail. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 593ff56ef2a23ed3a66ee87d9c9b33044b9fb193 Author: Dale Farnsworth Date: Mon Oct 1 16:02:18 2007 -0700 mv643xx_eth: Do not modify struct netdev tx_queue_len This driver erroneously zeros dev->tx_queue_len, since mp->tx_ring_size has not yet been initialized. Actually, the driver shouldn't modify tx_queue_len at all and should leave the value set by alloc_etherdev(), currently 1000. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 50626297b1beb0a29c0f174be39f36485533216c Author: Ron Mercer Date: Mon Oct 1 11:43:23 2007 -0700 qla3xxx: bugfix: Fix VLAN rx completion handling. Fix 4032 chip undocumented "feature" where bit-8 is set if the inbound completion is for a VLAN. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit b323e0e49fe9331ee3a7a336af879d6e303b16b3 Author: Ron Mercer Date: Mon Oct 1 11:43:22 2007 -0700 qla3xxx: bugfix: Add memory barrier before accessing rx completion. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 4c74d4ec3524a8f31deadd115139dd93bc91d598 Author: Tejun Heo Date: Sun Sep 30 01:11:20 2007 -0700 ata_piix: add another TECRA M3 entry to broken suspend list There's a different version of DMI table for TECRA M3 where it has proper vendor and product name entry. Add the entry to the broken suspend list. Angus Turnbull reported and provided initial patch. Signed-off-by: Tejun Heo Cc: Angus Turnbull Signed-off-by: Jeff Garzik commit 30084fbd1caa4b2e1a336fcdef60b68129d1d8f8 Author: Ingo Molnar Date: Tue Oct 2 14:13:08 2007 +0200 sched: fix profile=sleep fix sleep profiling - we lost this chunk in the CFS merge. Found-by: Mel Gorman Signed-off-by: Ingo Molnar commit 25e5566ed38650f7990041fcd20571d6ddd2a040 Author: David S. Miller Date: Tue Oct 2 01:03:09 2007 -0700 [SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy. For the case where the source is not aligned modulo 8 we don't use load-twins to suck the data in and this kills performance since normal loads allocate in the L1 cache (unlike load-twin) and thus big memcpys swipe the entire L1 D-cache. We need to allocate a register window to implement this properly, but that actually simplifies a lot of things as a nice side-effect. Signed-off-by: David S. Miller commit 04045f98e0457aba7d4e6736f37eed189c48a5f7 Author: John W. Linville Date: Mon Oct 1 21:03:54 2007 -0700 [IEEE80211]: avoid integer underflow for runt rx frames Reported by Chris Evans : > The summary is that an evil 80211 frame can crash out a victim's > machine. It only applies to drivers using the 80211 wireless code, and > only then to certain drivers (and even then depends on a card's > firmware not dropping a dubious packet). I must confess I'm not > keeping track of Linux wireless support, and the different protocol > stacks etc. > > Details are as follows: > > ieee80211_rx() does not explicitly check that "skb->len >= hdrlen". > There are other skb->len checks, but not enough to prevent a subtle > off-by-two error if the frame has the IEEE80211_STYPE_QOS_DATA flag > set. > > This leads to integer underflow and crash here: > > if (frag != 0) > flen -= hdrlen; > > (flen is subsequently used as a memcpy length parameter). How about this? Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 9b42c336d06411e6463949d2dac63949f66ff70b Author: Eric Dumazet Date: Mon Oct 1 13:58:36 2007 -0700 [TCP]: secure_tcp_sequence_number() should not use a too fast clock TCP V4 sequence numbers are 32bits, and RFC 793 assumed a 250 KHz clock. In order to follow network speed increase, we can use a faster clock, but we should limit this clock so that the delay between two rollovers is greater than MSL (TCP Maximum Segment Lifetime : 2 minutes) Choosing a 64 nsec clock should be OK, since the rollovers occur every 274 seconds. Problem spotted by Denys Fedoryshchenko [ This bug was introduced by f85958151900f9d30fa5ff941b0ce71eaa45a7de ] Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 32740ddc1095e5e320bf961dda146bf97bc28adb Author: Alexey Kuznetsov Date: Sun Sep 30 17:51:33 2007 -0700 [SFQ]: Remove artificial limitation for queue limit. This is followup to Patrick's patch. A little optimization to enqueue routine allows to remove artificial limitation on queue length. Plus, testing showed that hash function used by SFQ is too bad or even worse. It does not even sweep the whole range of hash values. Switched to Jenkins' hash. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit e48395f1753cab0fde6c03f1db833cece9ef2ba0 Author: Anton Blanchard Date: Mon Oct 1 07:45:55 2007 +1000 [POWERPC] Fix xics set_affinity code On a POWER6 machine running 2.6.23-rc8 I sometimes see the following error: xics_set_affinity: No online cpus in the mask 00000000,00000000,00000000,00000001 for irq 20 In a desperate attempt to get a changelog entry in 2.6.23, I took a look into it. It turns out we are passing a real and not a virtual irq into get_irq_server. This works for the case where hwirq < NR_IRQS and we set virq = hwirq. In my case however hwirq = 590082 and we try and access irq_desc[590082], slightly past the end at 512 entries. Lucky we ship lots of memory with our machines. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8cc8c28a9acdceda0e60519167a052cc3408c5c3 Author: David S. Miller Date: Sun Sep 30 17:00:34 2007 -0700 [SPARC64]: Fix put_user() calls in binfmt_aout32.c argv and envp are pointers to u32's in userspace, so don't try to put_user() a NULL to them. Aparently gcc-4.2.x now warns about this, and since we use -Werror for arch/sparc64 code, this breaks the build. Signed-off-by: David S. Miller commit 9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0 Author: David S. Miller Date: Thu Sep 27 13:09:28 2007 -0700 [SPARC]: Fix EBUS use of uninitialized variable. If of_get_property() fails, it returns NULL and the 'len' parameter is undefined. So we need to explicitly set len to zero in such cases. Noticed by Al Viro. Signed-off-by: David S. Miller commit 0b95f22bd3b91c7114c6892bbfbb5a8576b27fbe Author: Bryan Wu Date: Sun Sep 23 00:51:32 2007 +0800 Blackfin arch: add some missing syscall When compiling the Blackfin kernel, checksyscalls.pl will report lots of missing syscalls warnings. This patch will add some missing syscalls which make sense on Blackfin arch After appling this patch, toolchain should be rebuilt. Then recompiling the kernel with the new toolchain. Signed-off-by: Bryan Wu commit 576bb9ced2d274446639d7fbeee7125e24daf012 Author: Andrew Morton Date: Wed Oct 3 23:43:57 2007 +0800 binfmt_flat: checkpatch fixing minimum support for the blackfin relocations Cc: Bernd Schmidt Cc: David McCullough Cc: Greg Ungerer Cc: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Bryan Wu commit f9720205d1f847cb59e197e851b5276425363f6b Author: Bernd Schmidt Date: Wed Oct 3 23:41:43 2007 +0800 Binfmt_flat: Add minimum support for the Blackfin relocations Add minimum support for the Blackfin relocations, since we don't have enough space in each reloc. The idea is to store a value with one relocation so that subsequent ones can access it. Actually, this patch is required for Blackfin. Currently if BINFMT_FLAT is enabled, git-tree kernel will fail to compile. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu Cc: David McCullough Cc: Greg Ungerer Cc: Miles Bader Signed-off-by: Andrew Morton