commit 97855b49b6bac0bd25f16b017883634d13591d00 Author: J. Bruce Fields Date: Tue Oct 30 11:20:02 2007 -0400 locks: fix possible infinite loop in posix deadlock detection It's currently possible to send posix_locks_deadlock() into an infinite loop (under the BKL). For now, fix this just by bailing out after a few iterations. We may want to fix this in a way that better clarifies the semantics of deadlock detection. But that will take more time, and this minimal fix is probably adequate for any realistic scenario, and is simple enough to be appropriate for applying to stable kernels now. Thanks to George Davis for reporting the problem. Cc: "George G. Davis" Signed-off-by: J. Bruce Fields Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit fb7267acfef1de3e49d4e0c80be3cc603e974b3b Merge: 2d175d4... 2ea4649... Author: Linus Torvalds Date: Tue Oct 30 08:39:20 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: use a less common define name in BF549 Blackfin arch: Add missing definitions for BF561 Blackfin arch: reclaim a few bytes from the end of our init section Blackfin arch: fix libata data struct member from irq_type to irq_flags Blackfin arch: Do not pollute name space used in linux-2.6.x/sound Blackfin arch: Fix bug set correct baud for spi mmc and enable SPI after DMA. Blackfin arch: update board defconfig files according to latest information from ADI datasheet Blackfin arch: ensure that speculative loads of bad pointers don't cause us to do bad things. Blackfin arch: Add missing definitions of BF54x Blackfin arch: Fix random crash issue found by Michael. Blackfin arch: fix bug: tell users if the kernel is recovering from a fault condition Blackfin arch: add support for checking/clearing overruns in generic purpose Timer API Blackfin arch: cleanup arch/blackfin/kernel/traps.c handling code. Blackfin arch: Apply Bluetchnix vendor patch provided by Harald Krapfenbauer Blackfin arch: fix bug BlueTechnix CM-BF537 board config uses wrong IRQ for net2272 driver Blackfin arch: fix bug: kernel prints out error message twice Blackfin arch: add NFC driver support in BF527-EZKIT board Blackfin arch: Added support for HV Sistemas H8606 board commit 2d175d438f297bcd75a7b88baf3a304137047af6 Merge: c2db637... 502ef38... Author: Linus Torvalds Date: Tue Oct 30 08:08:40 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [TIPC]: Add tipc_config.h to include/linux/Kbuild. [WAN]: lmc_ioctl: don't return with locks held [SUNRPC]: fix rpc debugging [TCP]: Saner thash_entries default with much memory. [SUNRPC] rpc_rdma: we need to cast u64 to unsigned long long for printing [IPv4] SNMP: Refer correct memory location to display ICMP out-going statistics [NET]: Fix error reporting in sys_socketpair(). [NETFILTER]: nf_ct_alloc_hashtable(): use __GFP_NOWARN [NET]: Fix race between poll_napi() and net_rx_action() [TCP] MD5: Remove some more unnecessary casting. [TCP] vegas: Fix a bug in disabling slow start by gamma parameter. [IPVS]: use proper timeout instead of fixed value [IPV6] NDISC: Fix setting base_reachable_time_ms variable. commit c2db6376c934b9e4c0b905bee5222d5475bbd98a Author: Krzysztof Helt Date: Mon Oct 29 14:37:24 2007 -0700 s3c-rtc: remove unused variable Signed-off-by: Krzysztof Helt Acked-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23f42b7b2e538a27bc457a9ba12a6656343dc5ea Author: Atsushi Nemoto Date: Mon Oct 29 14:37:23 2007 -0700 serial: fix serial_txx9 console initialization Since commit 97d97224ff361e08777fb33e0fd193ca877dac28 ("[SERIAL] Fix console initialisation ordering"), serial_core calls ->pm() on initialization even if the port was used for console. This behaviour breaks serial_txx9 console since The serial_txx9 driver initialize its port entirely on its ->pm() method if new state was 0. This patch adds checking for oldstate value to fix this probelm. Signed-off-by: Atsushi Nemoto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10e27ed4bae199fefbc3e9f9473e32605797a003 Author: Takashi Iwai Date: Mon Oct 29 14:37:22 2007 -0700 intel-iommu: Fix array overflow Fix possible array overflow: drivers/pci/intel-iommu.c: In function ¡dmar_get_fault_reason¢: drivers/pci/intel-iommu.c:753: warning: array subscript is above array bounds drivers/pci/intel-iommu.c: In function ¡iommu_page_fault¢: drivers/pci/intel-iommu.c:753: warning: array subscript is above array bounds Signed-off-by: Takashi Iwai Cc: Mark Gross Acked-by: "Keshavamurthy, Anil S" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f664f1f9b77d6c64f3cee1875dcb4faba0da6dd4 Author: Andrew Morton Date: Mon Oct 29 14:37:21 2007 -0700 revert "ufs: Fix mount check in ufs_fill_super()" Evgeniy said: I wonder on what type of UFS do you test this patch? NetBSD and FreeBSD do not use "fs_state", they use "fs_clean" flag, only Solaris does check like this: fs_state + fs_time == FSOK. That's why parentheses was like that. At now with linux-2.6.24-rc1-git1, I get: fs need fsck, but NetBSD's fsck says that's all ok. I suggest revert this patch. Cc: Evgeniy Dushistov Cc: Satyam Sharma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 487e9bf25cbae11b131d6a14bdbb3a6a77380837 Author: Hugh Dickins Date: Mon Oct 29 14:37:20 2007 -0700 fix tmpfs BUG and AOP_WRITEPAGE_ACTIVATE It's possible to provoke unionfs (not yet in mainline, though in mm and some distros) to hit shmem_writepage's BUG_ON(page_mapped(page)). I expect it's possible to provoke the 2.6.23 ecryptfs in the same way (but the 2.6.24 ecryptfs no longer calls lower level's ->writepage). This came to light with the recent find that AOP_WRITEPAGE_ACTIVATE could leak from tmpfs via write_cache_pages and unionfs to userspace. There's already a fix (e423003028183df54f039dfda8b58c49e78c89d7 - writeback: don't propagate AOP_WRITEPAGE_ACTIVATE) in the tree for that, and it's okay so far as it goes; but insufficient because it doesn't address the underlying issue, that shmem_writepage expects to be called only by vmscan (relying on backing_dev_info capabilities to prevent the normal writeback path from ever approaching it). That's an increasingly fragile assumption, and ramdisk_writepage (the other source of AOP_WRITEPAGE_ACTIVATEs) is already careful to check wbc->for_reclaim before returning it. Make the same check in shmem_writepage, thereby sidestepping the page_mapped BUG also. Signed-off-by: Hugh Dickins Cc: Erez Zadok Cc: Reviewed-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bca44bbd39007065cc6a4e3a50201475629a6cf Author: Glauber de Oliveira Costa Date: Mon Oct 29 14:37:19 2007 -0700 mm/sparse-vmemmap.c: make sure init_mm is included mm/sparse-vmemmap.c uses init_mm in some places. However, it is not present in any of the headers currently included in the file. init_mm is defined as extern in sched.h, so we add it to the headers list Up to now, this problem was masked by the fact that functions like set_pte_at() and pmd_populate_kernel() are usually macros that expand to simpler variants that does not use the first parameter at all. Signed-off-by: Glauber de Oliveira Costa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4138f08d1c2783a28df2af6ed81aa180462ec374 Author: Andi Kleen Date: Mon Oct 29 14:37:18 2007 -0700 Remove bogus default y for DMAR and NET_DMA No reason I can think of of making them default y Most people don't have the hardware and with default y they just pollute lots of configs during make oldconfig. Signed-off-by: Andi Kleen Acked-by: Jeff Garzik Acked-by: "Nelson, Shannon" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc2a3f86f46569fb091792867ce67c9ab24dfd0f Author: J. Bruce Fields Date: Mon Oct 29 14:37:18 2007 -0700 sunrpc: fix rpc debugging Commit baa3a2a0d24ebcf1c451bec8e5bee3d3467f4cbb ("sysctl: remove broken sunrpc debug binary sysctls"), by removing initialization of the ctl_name field, broke this conditional, preventing the display of rpc_tasks that you previously got when turning on rpc debugging. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: J. Bruce Fields Acked-by: "Eric W. Biederman" Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc72233c838fbb459e786d2be3b5091f6cc50f4d Author: Olof Johansson Date: Mon Oct 29 14:37:17 2007 -0700 radeonfb: remove warning with CONFIG_PM=n Remove warning from powerpc ppc64_defconfig builds: drivers/video/aty/radeon_pm.c:30: warning: 'radeon_reinitialize_M10' declared 'static' but never defined It's used only under CONFIG_PM, and only with CONFIG_X86 before it is defined, so the forward declaration can be moved under the ifdef. Signed-off-by: Olof Johansson Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f08f3895f4171d336c52d37a81376a910a1673e0 Author: Randy Dunlap Date: Mon Oct 29 14:37:16 2007 -0700 fb menu: fix FB_OMAP dependencies so that menu is displayed correctly Fix FB_OMAP dependencies so that the OMAP FB driver options are presented correctly. Signed-off-by: Randy Dunlap Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64e862a579015d229b8e40b6bc4ac3612e9656e1 Author: Corey Minyard Date: Mon Oct 29 14:37:13 2007 -0700 IPMI: fix comparison in demangle_device_id Coverity spotted some incorrect code in a recent change to the IPMI driver; this patch make sure the data is really long enough to pull the manufacturer id and product id out of a get device id message. Signed-off-by: Corey Minyard Cc: Adrian Bunk Cc: Stian Jordet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc5f916e90a811dd8f809b4d17409f98e74b237c Author: Rafael J. Wysocki Date: Mon Oct 29 14:37:12 2007 -0700 Freezer: do not allow freezing processes to clear TIF_SIGPENDING Do not allow processes to clear their TIF_SIGPENDING if TIF_FREEZE is set, so that they will not race with the freezer (like mysqld does, for example). Signed-off-by: Rafael J. Wysocki Acked-by: Nigel Cunningham Acked-by: Pavel Machek Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 502ef38da15d817f8e67acefc12dc2212f7f8aa1 Author: David S. Miller Date: Tue Oct 30 01:19:19 2007 -0700 [TIPC]: Add tipc_config.h to include/linux/Kbuild. Needed, as reported in: http://bugzilla.kernel.org/show_bug.cgi?id=9260 Signed-off-by: David S. Miller commit e3376dca81bd45474143753339e109d877a7d129 Author: Roel Kluin <12o3l@tiscali.nl> Date: Tue Oct 30 01:11:46 2007 -0700 [WAN]: lmc_ioctl: don't return with locks held (akpm: it's doing copy_to_user() inside spin_lock_irqsave(): this driver appears to be beyond help). Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 521c2a43b2e72dd5c9ab1b1ae7f894ba8a58779d Author: J. Bruce Fields Date: Tue Oct 30 01:07:15 2007 -0700 [SUNRPC]: fix rpc debugging Commit baa3a2a0d24ebcf1c451bec8e5bee3d3467f4cbb, by removing initialization of the ctl_name field, broke this conditional, preventing the display of rpc_tasks that you previously got when turning on rpc debugging. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: J. Bruce Fields Acked-by: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0ccfe61803ad24f1c0fe5e1f5ce840ff0f3d9660 Author: Jean Delvare Date: Tue Oct 30 00:59:25 2007 -0700 [TCP]: Saner thash_entries default with much memory. On systems with a very large amount of memory, the heuristics in alloc_large_system_hash() result in a very large TCP established hash table: 16 millions of entries for a 128 GB ia64 system. This makes reading from /proc/net/tcp pretty slow (well over a second) and as a result netstat is slow on these machines. I know that /proc/net/tcp is deprecated in favor of tcp_diag, however at the moment netstat only knows of the former. I am skeptical that such a large TCP established hash is often needed. Just because a system has a lot of memory doesn't imply that it will have several millions of concurrent TCP connections. Thus I believe that we should put an arbitrary high limit to the size of the TCP established hash by default. Users who really need a bigger hash can always use the thash_entries boot parameter to get more. I propose 2 millions of entries as the arbitrary high limit. This makes /proc/net/tcp reasonably fast on the system in question (0.2 s) while being still large enough for me to be confident that network performance won't suffer. This is just one way to limit the hash size, there are others; I am not familiar enough with the TCP code to decide which is best. Thus, I would welcome the proposals of alternatives. [ 2 million is still too large, thus I've modified the limit in the change to be '512 * 1024'. -DaveM ] Signed-off-by: Jean Delvare Signed-off-by: David S. Miller commit e08a132b0ef3cf89dfbf1dea2c6248ea624bdcd7 Author: Stephen Rothwell Date: Tue Oct 30 00:44:32 2007 -0700 [SUNRPC] rpc_rdma: we need to cast u64 to unsigned long long for printing as some architectures have unsigned long for u64. net/sunrpc/xprtrdma/rpc_rdma.c: In function 'rpcrdma_create_chunks': net/sunrpc/xprtrdma/rpc_rdma.c:222: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64' net/sunrpc/xprtrdma/rpc_rdma.c:234: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64' net/sunrpc/xprtrdma/rpc_rdma.c: In function 'rpcrdma_count_chunks': net/sunrpc/xprtrdma/rpc_rdma.c:577: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64 Noticed on PowerPC pseries_defconfig build. Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 064f3605be6b9b77151274f60693843cabaa09ec Author: Mitsuru Chinen Date: Mon Oct 29 22:02:57 2007 -0700 [IPv4] SNMP: Refer correct memory location to display ICMP out-going statistics While displaying ICMP out-going statistics as Out counters in /proc/net/snmp, the memory location for ICMP in-coming statistics was referred by mistake. Signed-off-by: Mitsuru Chinen Acked-by: David L Stevens Signed-off-by: David S. Miller commit bf3c23d171e35e6e168074a1514b0acd59cfd81a Author: David S. Miller Date: Mon Oct 29 21:54:02 2007 -0700 [NET]: Fix error reporting in sys_socketpair(). If either of the two sock_alloc_fd() calls fail, we forget to update 'err' and thus we'll erroneously return zero in these cases. Based upon a report and patch from Rich Paul, and commentary from Chuck Ebbert. Signed-off-by: David S. Miller commit 29b67497f256399c4aa2adec27ab7ba24bba44e8 Author: Andrew Morton Date: Mon Oct 29 21:41:19 2007 -0700 [NETFILTER]: nf_ct_alloc_hashtable(): use __GFP_NOWARN This allocation is expected to fail and we handle it by fallback to vmalloc(). So don't scare people with nasty messages like http://bugzilla.kernel.org/show_bug.cgi?id=9190 Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0a7606c121d58c1831805262c5b764e181429e7d Author: David S. Miller Date: Mon Oct 29 21:28:47 2007 -0700 [NET]: Fix race between poll_napi() and net_rx_action() netpoll_poll_lock() synchronizes the ->poll() invocation code paths, but once we have the lock we have to make sure that NAPI_STATE_SCHED is still set. Otherwise we get: cpu 0 cpu 1 net_rx_action() poll_napi() netpoll_poll_lock() ... spin on ->poll_lock ->poll() netif_rx_complete netpoll_poll_unlock() acquire ->poll_lock() ->poll() netif_rx_complete() CRASH Based upon a bug report from Tina Yang. Signed-off-by: David S. Miller commit b0a713e9e6091b30d0e615d2be88017a57f37c76 Author: Matthias M. Dellweg <2500@gmx.de> Date: Mon Oct 29 20:55:27 2007 -0700 [TCP] MD5: Remove some more unnecessary casting. while reviewing the tcp_md5-related code further i came across with another two of these casts which you probably have missed. I don't actually think that they impose a problem by now, but as you said we should remove them. Signed-off-by: Matthias M. Dellweg <2500@gmx.de> Signed-off-by: David S. Miller commit c940587bf603b4295a7f5e9ff8fed123368a1ef7 Author: Xiaoliang (David) Wei Date: Mon Oct 29 20:24:36 2007 -0700 [TCP] vegas: Fix a bug in disabling slow start by gamma parameter. TCP Vegas implementation has a bug in the process of disabling slow-start with gamma parameter. The bug may lead to extreme unfairness in the presence of early packet loss. See details in: http://www.cs.caltech.edu/~weixl/technical/ns2linux/known_linux/index.html#vegas Switch the order of "if (tp->snd_cwnd <= tp->snd_ssthresh)" statement and "if (diff > gamma)" statement to eliminate the problem. Signed-off-by: Xiaoliang (David) Wei Signed-off-by: David S. Miller commit 5c81833c2f74304142be6dde5688bf444316da21 Author: Andy Gospodarek Date: Mon Oct 29 04:35:45 2007 -0700 [IPVS]: use proper timeout instead of fixed value Instead of using the default timeout of 3 minutes, this uses the timeout specific to the protocol used for the connection. The 3 minute timeout seems somewhat arbitrary (though I know it is used other places in the ipvs code) and when failing over it would be much nicer to use one of the configured timeout values. Signed-off-by: Andy Gospodarek Acked-by: Simon Horman Signed-off-by: David S. Miller commit ad02ac145d49067a94bf8f3357c527020d5893ed Author: YOSHIFUJI Hideaki Date: Mon Oct 29 01:32:23 2007 -0700 [IPV6] NDISC: Fix setting base_reachable_time_ms variable. This bug was introduced by the commit d12af679bcf8995a237560bdf7a4d734f8df5dbb (sysctl: fix neighbour table sysctls). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit c8593884f2768fa3ff6f7e199d75b6ca91f9e891 Merge: 4282b01... 1942971... Author: Linus Torvalds Date: Mon Oct 29 21:46:09 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (26 commits) cpuidle: remove unused exports acpi: remove double mention of Support for ACPI option ACPI: use select POWER_SUPPLY for AC, BATTERY and SBS ACPI: Battery: Allow extract string from integer ACPI: battery: Support for non-spec name for LiIon technology ACPI: battery: register power_supply subdevice only when battery is present suspend: MAINTAINERS update ACPI: update MAINTAINERS fujitsu-laptop.c: remove dead code cpuidle: unexport tick_nohz_get_sleep_length ACPI: battery: Update battery information upon sysfs read. fujitsu-laptop: make 2 functions static ACPI: EC: fix use-after-free ACPI: battery: remove dead code ACPI: Fan: Drop force_power_state acpi_device option ACPI: Fan: fan device does not need own structure ACPI: power: don't cache power resource state ACPI: EC: Output changes to operational mode ACPI: EC: Add workaround for "optimized" controllers ACPI: EC: Don't re-enable GPE for each transaction. ... commit 4282b01e0075ac4495ab2e1cd012cbc43e764c51 Merge: 9301899... aa69432... Author: Linus Torvalds Date: Mon Oct 29 21:44:20 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86 boot: document for 32 bit boot protocol remove the dead X86_REMOTE_DEBUG option x86: merge EARLY_PRINTK options x86: mm/discontig_32.c: make code static x86: kernel/setup_32.c: unexport machine_id x86 gart: rename symbols only used for the GART implementation x86 gart: make some variables and functions static x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU x86 gart: rename iommu.h to gart.h x86: additional CPUID strings; fix strings for AMD-ecx commit 2ea4649b3634b9dbd098d0d8be65304eb2ea3a9c Author: Mike Frysinger Date: Tue Oct 30 12:04:53 2007 +0800 Blackfin arch: use a less common define name in BF549 Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 41241c17eb11df08efa81727f9c01225cd0f56b3 Author: Mike Frysinger Date: Tue Oct 30 12:03:47 2007 +0800 Blackfin arch: Add missing definitions for BF561 Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 36208059c18cd5e8c89fc9037cb1a79e62733882 Author: Mike Frysinger Date: Tue Oct 30 12:00:02 2007 +0800 Blackfin arch: reclaim a few bytes from the end of our init section Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 64e5c51291ec760e7fdb7628fe63690d1dc6aaf7 Author: Mike Frysinger Date: Tue Oct 30 11:56:13 2007 +0800 Blackfin arch: fix libata data struct member from irq_type to irq_flags Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit be0f3131a9cc7239d438b5016643e3eb9c8d8c21 Author: Michael Hennerich Date: Tue Oct 30 11:53:55 2007 +0800 Blackfin arch: Do not pollute name space used in linux-2.6.x/sound Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 111cf97d2cf35fbaa5eaff6ec5d395a06e14aadf Author: Sonic Zhang Date: Tue Oct 30 11:48:42 2007 +0800 Blackfin arch: Fix bug set correct baud for spi mmc and enable SPI after DMA. Changes: 1. The baud for spi mmc defined in board file is not used by the old spi driver. A slower value from spi framework is used instead. In latest bug fixing, the correct baud is use which is too high for spi MMC card. 2. SPI is enabled only after DMA is started. 3. MMC detection IRQ is set to 55. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 0355893e77b6c4d24a5843d420e97ae86762f964 Author: Bryan Wu Date: Tue Oct 30 11:39:47 2007 +0800 Blackfin arch: update board defconfig files according to latest information from ADI datasheet Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 9301899be75b464ef097f0b5af7af6d9bd8f68a7 Author: Balbir Singh Date: Tue Oct 30 00:26:32 2007 +0100 sched: fix /proc//stat stime/utime monotonicity, part 2 Extend Peter's patch to fix accounting issues, by keeping stime monotonic too. Signed-off-by: Balbir Singh Signed-off-by: Ingo Molnar Tested-by: Frans Pop commit aa69432a68fb0aec49551fd69fe920a6df572573 Author: Huang, Ying Date: Wed Oct 24 10:18:49 2007 +0800 x86 boot: document for 32 bit boot protocol This patch documents the 32-bit boot protocol of x86. It has been used by Kexec and LinuxBIOS. This patch is based on the proposal of Peter Anvin. Signed-off-by: Huang Ying Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 076e21a0142ac33d53bc0cca58c6170d4ad14f5d Author: Adrian Bunk Date: Mon Oct 29 13:49:16 2007 +0100 remove the dead X86_REMOTE_DEBUG option This patch removes the dead X86_REMOTE_DEBUG option. Signed-off-by: Adrian Bunk commit 1b8a8e95f9671ee449a794f87468738963393a72 Author: Adrian Bunk Date: Mon Oct 29 13:49:36 2007 +0100 x86: merge EARLY_PRINTK options This patch merges the x86_64 EARLY_PRINTK option into the i386 one. Signed-off-by: Adrian Bunk commit fb8c177fe04c81ef5abe603e01d51eafa02d903a Author: Adrian Bunk Date: Wed Oct 24 18:24:47 2007 +0200 x86: mm/discontig_32.c: make code static node0_bdata and paddr_to_nid() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f1aa14b2e930a6dfab888ded1a2a951a0ff279dc Author: Adrian Bunk Date: Wed Oct 24 18:25:06 2007 +0200 x86: kernel/setup_32.c: unexport machine_id This patch removes the unused EXPORT_SYMBOL(machine_id). Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0440d4c00dadf8b97657c0864e4d54a088430de8 Author: Joerg Roedel Date: Wed Oct 24 12:49:50 2007 +0200 x86 gart: rename symbols only used for the GART implementation This patch renames the 4 symbols iommu_hole_init(), iommu_aperture, iommu_aperture_allowed, iommu_aperture_disabled. All these symbols are only used for the GART implementation of IOMMUs. It adds and additional gart_ prefix to them. Signed-off-by: Joerg Roedel Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 79da0874410c0af8958f0ee3a50aa5b67eecc640 Author: Joerg Roedel Date: Wed Oct 24 12:49:49 2007 +0200 x86 gart: make some variables and functions static This patch makes some functions and variables static in pci-gart_64.c which are not used somewhere else. Signed-off-by: Joerg Roedel Acked-by: Muli Ben-Yehuda Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 966396d3a05c8049fce5c81c49138e5ee1b05443 Author: Joerg Roedel Date: Wed Oct 24 12:49:48 2007 +0200 x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU This patch renames the IOMMU config option to GART_IOMMU because in fact it means the GART and not general support for an IOMMU on x86. Signed-off-by: Joerg Roedel Acked-by: Muli Ben-Yehuda Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 395624fcddd178de01a78aa88670a86ec919de77 Author: Joerg Roedel Date: Wed Oct 24 12:49:47 2007 +0200 x86 gart: rename iommu.h to gart.h This patch renames the include file asm-x86/iommu.h to asm-x86/gart.h to make clear to which IOMMU implementation it belongs. The patch also adds "GART" to the Kconfig line. Signed-off-by: Joerg Roedel Acked-by: Muli Ben-Yehuda Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e1054b39b275340f7ba0308eca83c127b36e936e Author: H. Peter Anvin Date: Fri Oct 26 14:09:09 2007 -0700 x86: additional CPUID strings; fix strings for AMD-ecx Additional CPUID strings (sse4_1, sse4_2, sse5, skinit, wdt); fix the positioning of the AMD ecx strings (cr8_legacy was duplicated under two different names, so the alignment of all the other strings were off by one.) Signed-off-by: H. Peter Anvin Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 1942971b20817def5fd1142248307c7c3c51fc8a Merge: 37e58df... 355ee5e... Author: Len Brown Date: Mon Oct 29 17:31:01 2007 -0400 Pull documentation into release branch commit 37e58df30063e229ee5157f9d1c1fa1d749917c2 Merge: b2451e4... 83788c0... Author: Len Brown Date: Mon Oct 29 17:30:55 2007 -0400 Pull cpuidle into release branch commit b2451e4399d7233cd0008823872f51112d18f8d0 Merge: 14f7d72... b023b43... Author: Len Brown Date: Mon Oct 29 17:30:48 2007 -0400 Pull fujitsu into release branch commit 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 Merge: 6a22c57... 5527c8b... Author: Len Brown Date: Mon Oct 29 17:30:21 2007 -0400 Pull alexey-fixes into release branch commit 83788c0caed3a425f64fa88fde7c78746b9cdd76 Author: Adrian Bunk Date: Mon Oct 29 13:49:13 2007 +0100 cpuidle: remove unused exports This patch removes the following unused exports: - cpuidle_devices - cpuidle_register_governor - cpuidle_unregister_governor Signed-off-by: Adrian Bunk Signed-off-by: Len Brown commit 355ee5eb60e7ce5b5379788c56d36ab162771f7d Author: Frans Pop Date: Mon Oct 29 17:20:38 2007 -0400 acpi: remove double mention of Support for ACPI option Current description for CONFIG_ACPI includes the word "Support" twice. One effect of this is that in menuconfig the "--->" that indicates the presence of sub-options will not show up unless you have a very wide console. Signed-off-by: Frans Pop Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5527c8bee27fa063dcec0e020fb8c242ba4270c2 Author: Alexey Starikovskiy Date: Mon Oct 29 17:08:59 2007 -0400 ACPI: use select POWER_SUPPLY for AC, BATTERY and SBS POWER_SUPPLY is needed for AC, battery, and SBS sysfs support. Use 'select' instead of 'depends on', as it is will not be selected by anything else, leading to confusion. Signed-off-by: Alexey Starikovskiy Tested-by: Frans Pop Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 82798a17ad40df827d465329a20ace80497f9b32 Merge: db81853... 1a3b792... Author: Linus Torvalds Date: Mon Oct 29 14:06:55 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: (34 commits) [MIPS] tb0219: Update copyright message. [MIPS] MT: Fix bug in multithreaded kernels. [MIPS] Alchemy: Remove CONFIG_TS_AU1X00_ADS7846 from defconfigs. Author: Ralf Baechle [MIPS] sb1250: Enable GenBus IDE in defconfig. [MIPS] vmlinux.ld.S: correctly indent .data section [MIPS] c-r3k: Implement flush_cache_range() [MIPS] Store sign-extend register values for PTRACE_GETREGS [MIPS] Alchemy: Register platform devices [MIPS] Add len and addr validation for MAP_FIXED mappings. [MIPS] IRIX: Fix off-by-one error in signal compat code. [MIPS] time: Replace plat_timer_setup with modern APIs. [MIPS] time: Fix cut'n'paste bug in Sibyte clockevent driver. [MIPS] time: Make c0_compare_int_usable faster [MIPS] time: Fix cevt-r4k.c for 64-bit kernel [MIPS] Sibyte: Delete {sb1250,bcm1480}_steal_irq(). [MIPS] txx9tmr clockevent/clocksource driver [MIPS] Add mips_hpt_frequency check to mips_clockevent_init(). [MIPS] IP32: Fixes after interrupt renumbering. [MIPS] IP27: Fix slice logic to work for arbitrary number of slices. ... commit db8185360d91c01f6e482db5ee402c0ad90dec52 Merge: 6a22c57... 38605ca... Author: Linus Torvalds Date: Mon Oct 29 14:06:19 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 style in kernel/sched.c sched: fix style of swap() macro in kernel/sched_fair.c sched: report CPU usage in CFS cgroup directories sched: move rcu_head to task_group struct sched: fix incorrect assumption that cpu 0 exists sched: keep utime/stime monotonic sched: make kernel/sched.c:account_guest_time() static commit 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 Author: Linus Torvalds Date: Mon Oct 29 11:36:04 2007 -0700 Revert "x86_64: allocate sparsemem memmap above 4G" This reverts commit 2e1c49db4c640b35df13889b86b9d62215ade4b6. First off, testing in Fedora has shown it to cause boot failures, bisected down by Martin Ebourne, and reported by Dave Jobes. So the commit will likely be reverted in the 2.6.23 stable kernels. Secondly, in the 2.6.24 model, x86-64 has now grown support for SPARSEMEM_VMEMMAP, which disables the relevant code anyway, so while the bug is not visible any more, it's become invisible due to the code just being irrelevant and no longer enabled on the only architecture that this ever affected. Reported-by: Dave Jones Tested-by: Martin Ebourne Cc: Zou Nan hai Cc: Suresh Siddha Cc: Andrew Morton Acked-by: Andy Whitcroft Signed-off-by: Linus Torvalds commit 106449e870b3069c049a3486ae7b47995351270c Author: Alexey Starikovskiy Date: Mon Oct 29 23:29:40 2007 +0300 ACPI: Battery: Allow extract string from integer Some machines return integer instead of expected string. Signed-off-by: Alexey Starikovskiy Tested-by: Andrey Borzenkov Tested-by: Frans Pop Signed-off-by: Len Brown commit 0bde7eee9489cc7cce08cf6eba05b4f42a6b2334 Author: Alexey Starikovskiy Date: Sun Oct 28 15:33:10 2007 +0300 ACPI: battery: Support for non-spec name for LiIon technology Support Li-Ion as possible name for technology. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 508df92d1f8d1921013cb4f45bb547d0eaff912a Author: Andrey Borzenkov Date: Sun Oct 28 12:50:09 2007 +0300 ACPI: battery: register power_supply subdevice only when battery is present Make sure no power_supply object is present unless we actualy detect presence of battery. This fixes ghost batteries detected by HAL Signed-off-by: Andrey Borzenkov Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 38605cae99d386332df6822a22dba7bfdc8fae1c Author: Ingo Molnar Date: Mon Oct 29 21:18:11 2007 +0100 sched: fix style in kernel/sched.c fallout of recent commits: small coding style fixes. Signed-off-by: Ingo Molnar commit 8eb172d9418c9387234a2c9a344131c46b5eea5b Author: Ingo Molnar Date: Mon Oct 29 21:18:11 2007 +0100 sched: fix style of swap() macro in kernel/sched_fair.c fix style of swap() macro in kernel/sched_fair.c. ( this macro should eventually move to a general header, as ext3 uses a similar construct too. ) Signed-off-by: Ingo Molnar commit fe5c7cc22897b809a2fbe05bea71963853df7f17 Author: Paul Menage Date: Mon Oct 29 21:18:11 2007 +0100 sched: report CPU usage in CFS cgroup directories Adds a cpu.usage file to the CFS cgroup that reports CPU usage in milliseconds for that cgroup's tasks [ mingo@elte.hu: style cleanups. ] Signed-off-by: Paul Menage Signed-off-by: Ingo Molnar commit ae8393e508e5f17add66964688c49bf0bfe4fcf9 Author: Srivatsa Vaddagiri Date: Mon Oct 29 21:18:11 2007 +0100 sched: move rcu_head to task_group struct Peter Zijlstra noticed that the rcu_head object need not be present in every cfs_rq of a group. Move it to the task_group structure instead. Signed-off-by: Srivatsa Vaddagiri Signed-off-by: Ingo Molnar commit 7bae49d498de87f0da0c20c67adaa278eac84566 Author: James Bottomley Date: Mon Oct 29 21:18:11 2007 +0100 sched: fix incorrect assumption that cpu 0 exists This patch: commit 9b5b77512dce239fa168183fa71896712232e95a Author: Srivatsa Vaddagiri Date: Mon Oct 15 17:00:09 2007 +0200 sched: clean up code under CONFIG_FAIR_GROUP_SCHED Introduced an assumption of the existence of CPU0 via this line cfs_rq = tg->cfs_rq[0]; If you have no CPU0, that will be NULL. The fix seems to be just to take whatever cfs_rq queue comes out of the for_each_possible_cpu() loop, since they're all equally good for the destruction operation. Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar commit 73a2bcb0edb9ffb0b007b3546b430e2c6e415eee Author: Peter Zijlstra Date: Mon Oct 29 21:18:11 2007 +0100 sched: keep utime/stime monotonic keep utime/stime monotonic. cpustats use utime/stime as a ratio against sum_exec_runtime, as a consequence it can happen - when the ratio changes faster than time accumulates - that either can be appear to go backwards. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit f7402e0361d4472535e07cfca648f2fa81d85cd2 Author: Adrian Bunk Date: Mon Oct 29 21:18:10 2007 +0100 sched: make kernel/sched.c:account_guest_time() static account_guest_time() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar commit 1a3b7920fe55247d39c3e1ac1e9b8aca607d0188 Author: Ralf Baechle Date: Mon Oct 29 19:35:37 2007 +0000 [MIPS] tb0219: Update copyright message. Signed-off-by: Ralf Baechle commit a76ab5c10d99bdf458067cb495e72c0ee5f09909 Author: Ralf Baechle Date: Mon Oct 8 16:38:37 2007 +0100 [MIPS] MT: Fix bug in multithreaded kernels. When GDB writes a breakpoint into address area of inferior process the kernel needs to invalidate the modified memory in the inferior which is done by calling flush_cache_page which in turns calls r4k_flush_cache_page and local_r4k_flush_cache_page for VSMP or SMTC kernel via r4k_on_each_cpu(). As the VSMP and SMTC SMP kernels for 34K are running on a single shared caches it is possible to get away without interprocessor function calls. This optimization is implemented in r4k_on_each_cpu, so local_r4k_flush_cache_page is only ever called on the local CPU. This is where the following code in local_r4k_flush_cache_page() strikes: /* * If ownes no valid ASID yet, cannot possibly have gotten * this page into the cache. */ if (cpu_context(smp_processor_id(), mm) == 0) return; On VSMP and SMTC had a function of cpu_context() for each CPU(TC). So in case another CPU than the CPU executing local_r4k_cache_flush_page has not accessed the mm but one of the other CPUs has there may be data to be flushed in the cache yet local_r4k_cache_flush_page will falsely return leaving the I-cache inconsistent for the breakpoint. While the issue was discovered with GDB it also exists in local_r4k_flush_cache_range() and local_r4k_flush_cache(). Fixed by introducing a new function has_valid_asid which on MT kernels returns true if a mm is active on any processor in the system. This is relativly expensive since for memory acccesses in that loop cache misses have to be assumed but it seems the most viable solution for 2.6.23 and older -stable kernels. Signed-off-by: Ralf Baechle commit a370605594bc9f375d2912096f01643c46b4b709 Author: Ralf Baechle Date: Mon Oct 29 19:35:37 2007 +0000 [MIPS] Alchemy: Remove CONFIG_TS_AU1X00_ADS7846 from defconfigs. Signed-off-by: Ralf Baechle commit 1553f6a2ca53b0d723f21d915fdd3d2cf7c8f852 Author: Ralf Baechle Date: Tue Oct 9 15:15:21 2007 +0100 Author: Ralf Baechle [MIPS] MSP71xx: Fix bitrot. Signed-off-by: Ralf Baechle commit d9ba26a93a691df24fa520dc47ee9f6f05014bf1 Author: Maciej W. Rozycki Date: Fri Oct 12 16:46:56 2007 +0100 [MIPS] sb1250: Enable GenBus IDE in defconfig. Enable the onboard GenBus IDE interface in the default configuration. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit 16be243589934f5e76f7fc2c3eb65c9909d56f93 Author: Franck Bui-Huu Date: Thu Oct 18 23:12:32 2007 +0200 [MIPS] vmlinux.ld.S: correctly indent .data section Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit 21b2aecaae3a46a13dbe775639e7d060bec033bd Author: Maciej W. Rozycki Date: Wed Oct 17 11:51:39 2007 +0100 [MIPS] c-r3k: Implement flush_cache_range() Contrary to the belief of some, the R3000 and related processors did have caches, both a data and an instruction cache. Here is an implementation of r3k_flush_cache_page(), which is the processor-specific back-end for flush_cache_range(), done according to the spec in Documentation/cachetlb.txt. While at it, remove an unused local function: get_phys_page(), do some trivial formatting fixes and modernise debugging facilities. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit 62b14c24b10033591bbab16dea165d696a616f37 Author: Atsushi Nemoto Date: Fri Oct 26 00:53:02 2007 +0900 [MIPS] Store sign-extend register values for PTRACE_GETREGS A comment on ptrace_getregs() states "Registers are sign extended to fill the available space." but it is not true. Fix code to match the comment. Also fix casts on each caller to get rid of some warnings. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 26c288f82c74dba08da6321c626c101a7aa8575b Author: Florian Fainelli Date: Tue Oct 23 18:55:55 2007 +0200 [MIPS] Alchemy: Register platform devices This patch separates the platform devices registration for the MTX-1 specific devices: GPIO leds and watchdog. [Minor fixup and formatting change -- Ralf] Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 098362e72002d01fdd18afee2e635ffdcdc89e2c Author: David Daney Date: Sat Oct 27 23:10:20 2007 -0700 [MIPS] Add len and addr validation for MAP_FIXED mappings. Mmap with MAP_FIXED was not validating the addr and len parameters. This leads to the failure of GCC's gcc.c-torture/execute/loop-2[fg].c testcases when using the o32 ABI on a 64 bit kernel. These testcases try to mmap 65536 bytes at 0x7fff8000 and then access all the memory. In 2.6.18 and 2.6.23.1 (and likely other versions as well) the kernel maps the requested memory, but since half of it is above 0x80000000 a SIGBUS is generated when it is accessed. This patch moves the len validation above the MAP_FIXED processing so that it is always validated. It also adds validation to the addr parameter for MAP_FIXED mappings. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit c4e8308c30b0139f89bac71f3c22c8d7413b8665 Author: Ralf Baechle Date: Mon Oct 29 15:00:37 2007 +0000 [MIPS] IRIX: Fix off-by-one error in signal compat code. Based on original patch by Roel Kluin <12o3l@tiscali.nl>. Signed-off-by: Ralf Baechle commit 38760d40ca61b18b2809e9c28df8b3ff9af8a02b Author: Ralf Baechle Date: Mon Oct 29 14:23:43 2007 +0000 [MIPS] time: Replace plat_timer_setup with modern APIs. plat_timer_setup is no longer getting called. Signed-off-by: Ralf Baechle commit 1238d5d868a56dcbc743d3ffc9bd3c920258b4cb Author: Ralf Baechle Date: Mon Oct 29 11:36:24 2007 +0000 [MIPS] time: Fix cut'n'paste bug in Sibyte clockevent driver. Signed-off-by: Ralf Baechle commit 3a6c43a78763da67d4049745ce35122734e89fbc Author: Atsushi Nemoto Date: Tue Oct 23 21:55:42 2007 +0900 [MIPS] time: Make c0_compare_int_usable faster Try increasingly longer time periods starting of at 0x10 cycles. This should be fast on hardware and work nicely with emulators. Signed-off-by: Ralf Baechle commit c637fecb4fe67e2baccef24b9b7e9cb79ee23cf8 Author: Atsushi Nemoto Date: Tue Oct 23 21:51:19 2007 +0900 [MIPS] time: Fix cevt-r4k.c for 64-bit kernel The expression "(long)(read_c0_count() - cnt)" can never be a negative value on 64-bit kernel. Cast to "int" before comparison. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 11ca25aa312d912c192ccfd5781669d794126118 Author: Ralf Baechle Date: Sun Oct 28 23:02:46 2007 +0000 [MIPS] Sibyte: Delete {sb1250,bcm1480}_steal_irq(). They break the timer interrupt initialization and only seem to be a kludge for initialization happening in the wrong order. Further testing done by Thiemo confirms the suspicion that the other invocations also seem to have useless. Signed-off-by: Ralf Baechle commit 229f773ef4ee852ad7bfbe8e1238a2c35b2baa6f Author: Atsushi Nemoto Date: Thu Oct 25 01:34:09 2007 +0900 [MIPS] txx9tmr clockevent/clocksource driver Convert jmr3927_clock_event_device to more generic txx9tmr_clock_event_device which supports one-shot mode. The txx9tmr_clock_event_device can be used for TX49 too if the cp0 timer interrupt was not available. Convert jmr3927_hpt_read to txx9_clocksource driver which does not depends jiffies anymore. The txx9_clocksource itself can be used for TX49, but normally TX49 uses higher precision clocksource_mips. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 22df3f53e33d55335e1ef43d4e6ead54b379b3a2 Author: Yoichi Yuasa Date: Fri Oct 26 22:27:05 2007 +0900 [MIPS] Add mips_hpt_frequency check to mips_clockevent_init(). Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 8a13ecd7b2f8008659e91213f2803f269f1d8edf Author: Ralf Baechle Date: Sun Oct 28 18:46:39 2007 +0000 [MIPS] IP32: Fixes after interrupt renumbering. And general untangling. Signed-off-by: Ralf Baechle commit 725d7b36c3287217e14cea6fec6c0b897f500a10 Author: Ralf Baechle Date: Sun Oct 28 23:02:37 2007 +0000 [MIPS] IP27: Fix slice logic to work for arbitrary number of slices. Signed-off-by: Ralf Baechle commit 84953b39f9b57f89f87b5974c599b8111658f0b6 Author: Ralf Baechle Date: Fri Oct 26 14:36:10 2007 +0100 [MIPS] SNI: Convert a20r timer to clockevent device. Signed-off-by: Ralf Baechle commit e0511f75246df404e72fc1376967253d2f460c34 Author: Ralf Baechle Date: Fri Oct 26 13:52:41 2007 +0100 [MIPS] time: Merge eXcite plat_timer_setup into plat_time_init. Fixme: At the time of this writing cevt-r4k.c doesn't yet know about how to handle the alternate timer interrupt of the RM9000. Signed-off-by: Ralf Baechle commit ba5eac515f73910744c5d9f8fc1c5d6548cf6ff4 Author: Ralf Baechle Date: Fri Oct 26 13:43:32 2007 +0100 [MIPS] time: Merge lasat plat_timer_setup into plat_time_init. Since the cp0 compare interrupt handler isn't initialized by the time plat_time_init is called don't set IE_IRQ5 anymore, cevt-r4k.c will do that a little later itself. Signed-off-by: Ralf Baechle commit da349bef9700e0dbf69e4273fa87c476c46c454f Author: Ralf Baechle Date: Fri Oct 26 13:36:15 2007 +0100 [MIPS] time: Remove wrppmc's definition of plat_timer_setup. The only thing it used to do is now done by cevt-r4k.c. Signed-off-by: Ralf Baechle commit 656db5061dc5758dc52cdbf26de5cd25aca82d7a Author: Ralf Baechle Date: Fri Oct 26 13:24:06 2007 +0100 [MIPS] time: Cause platform definitions of plat_timer_setup to cause error. Signed-off-by: Ralf Baechle commit 0d0cc920de658126560938a01f12e6e8ca7d5bcd Author: Ralf Baechle Date: Fri Oct 26 13:23:02 2007 +0100 [MIPS] time: Remove declaration of plat_timer_setup, there is no caller. Signed-off-by: Ralf Baechle commit bc2f2a24d9cd52bd6f5307ab36ffa041366d936d Author: Ralf Baechle Date: Fri Oct 26 12:58:02 2007 +0100 [MIPS] Alchemy: Convert from plat_timer_setup to plat_time_init. The old plat_timer_setup hook is no longer getting called so the Alchemy time initialization was getting skipped. Signed-off-by: Ralf Baechle commit 82923663419d376b6c418d353231efb3f7c2b878 Author: Ralf Baechle Date: Wed Oct 24 15:54:32 2007 +0100 [MIPS] vpe: Use p_paddr instead of p_vaddr loader. This subtle difference makes ELF overlays work. Signed-off-by: Ralf Baechle commit 6e86b0bf0bd997aad4a5f67b1cba90db11ade6e3 Author: Ralf Baechle Date: Mon Oct 29 19:35:33 2007 +0000 [MIPS] Cleanup random difference between the lmo and kernel.org tree. Signed-off-by: Ralf Baechle commit 11c03a6faa471ae37f4fd3db79389ae6297b66db Author: Yoichi Yuasa Date: Tue Oct 23 18:22:50 2007 +0900 [MIPS] time: set clock before clockevent_delta2ns() in GT641xx. clockevent_delta2ns() use the shift and mult value, so clockevent_set_clock() should be called first. Pointed out by Atsushi Nemoto. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c984c87826a6e3b2adae1fab8d5bddcf26af8c78 Author: Yoichi Yuasa Date: Tue Oct 23 18:19:13 2007 +0900 [MIPS] time: Use non-interrupt locks in GT641xx clockevent driver set_next_event() and set_mode() are always called with interrupt disabled. irqsave and irqrestore are not necessary for spinlock. Pointed out by Atsushi Nemoto. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 2c771a4c28a71b6acc0bd6b7ef56e0a1849c9b09 Author: Ralf Baechle Date: Tue Oct 23 03:04:19 2007 +0100 [MIPS] Alchemy: micro-optimizatize time code. Signed-off-by: Ralf Baechle commit 310a09d8508b8e048c7efdf53bb91f2cd787b58e Author: Ralf Baechle Date: Tue Oct 23 02:59:55 2007 +0100 [MIPS] Alchemy: Nuke homebrew setup_irq(), it's broken and unnecessary. Signed-off-by: Ralf Baechle commit be5f1f2114665508a722e3924a3a7f477c502841 Author: Kevin D. Kissell Date: Wed Mar 21 13:28:37 2007 +0100 [MIPS] SMTC: Allow control over TC assignment to vpe0. Modify the SMTC initialization code to allow boot-time specification not only of how many VPEs and TCs to use, but also how many TCs out of the allowed pool are to be bound to VPE 0. The new boot option is "vpe0tcs=N", where N is an integer. Using it in combination with the existing options allows arbitrary assignments across the 2 VPEs of a 34K. e.g. "maxtcs=3 vpe0tcs=1" forces VPE0 to have 1 TC, while VPE1 has 2, and "maxtcs=4 vpe0tcs=3" forces VPE0 to have 3 TCs, while VPE1 gets 1. If no vpe0tcs option is specified, the traditional algorithm of evenly dividing TCs between available VPEs, with the odd "slop" going to VPE0, is retained. The reason for doing this is to allow a finer balancing of TCs which can handle I/O interrupts on Malta (those on VPE 0) and those which cannot. Signed-off-by: Ralf Baechle commit 3529a233421fc43fa7bfdf7a4317daf28348a23d Merge: 00cda56... 3155659... Author: Linus Torvalds Date: Mon Oct 29 12:12:34 2007 -0700 Merge branch 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] AHCI: add hw link power management support [libata] Link power management infrastructure commit 00cda56d39f013cce60f44f1e3da19b87eba5d85 Merge: da8e5aa... ab6fc95... Author: Linus Torvalds Date: Mon Oct 29 12:11:54 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: [libata] AHCI: fix newly introduced host-reset bug [libata] sata_nv: fix SWNCQ enabling libata: add MAXTOR 7V300F0/VA111900 to NCQ blacklist libata: no need to speed down if already at PIO0 libata: relocate forcing PIO0 on reset pata_ns87415: define SUPERIO_IDE_MAX_RETRIES [libata] Address some checkpatch-spotted issues [libata] fix 'if(' and similar areas that lack whitespace libata: implement ata_wait_after_reset() libata: track SLEEP state and issue SRST to wake it up libata: relocate and fix post-command processing commit da8e5aa21e037be02e0752e80b9444ff60185a3f Merge: a43f007... 9030b3d... Author: Linus Torvalds Date: Mon Oct 29 12:11:24 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: (22 commits) Fix ethernet multicast for ucc_geth. netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes. FEC - fast ethernet controller for mpc52xx ehea: add kexec support e1000e: Remove legacy jumbo frame receive code e1000e: Re-enable SECRC - crc stripping e1000e: Fix PBA calculation for jumbo frame packets e1000e: Fix jumbo frame receive code. drivers/net/irda/au1k_ir: fix obvious irq handler bugs ipg: Kconfig whitepaces/tab damages ipg: missing Kconfig dependency r8169: remove poll_locked logic r8169: napi config [PATCH] iwl3945: fix direct scan problem [PATCH] iwl3945: cancel scan on rxon command [PATCH] iwl4965: fix scan problem [PATCH] iwl4965: fix driver hang related to hardware scan [PATCH] iwlwifi: fix sending probe request in iwl 4965 [PATCH] rtl8187: Allow multicast frames [PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative ... commit a43f007ba19cef4fac953d9e860e8a668e042e2d Merge: f2b8544... b393243... Author: Linus Torvalds Date: Mon Oct 29 12:10:49 2007 -0700 Merge branch 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'warnings-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [ISDN] capidrv: address two longstanding warnings commit 31556594f913fa81d008cecfe46d7211c919a853 Author: Kristen Carlson Accardi Date: Thu Oct 25 01:33:26 2007 -0400 [libata] AHCI: add hw link power management support This patch will set the correct bits to turn on Aggressive Link Power Management (ALPM) for the ahci driver. This will cause the controller and disk to negotiate a lower power state for the link when there is no activity (see the AHCI 1.x spec for details). This feature is mutually exclusive with Hot Plug, so when ALPM is enabled, Hot Plug is disabled. ALPM will be enabled by default, but it is settable via the scsi host syfs interface. Possible settings for this feature are: Setting Effect ---------------------------------------------------------- min_power ALPM is enabled, and link set to enter lowest power state (SLUMBER) when idle Hot plug not allowed. max_performance ALPM is disabled, Hot Plug is allowed medium_power ALPM is enabled, and link set to enter second lowest power state (PARTIAL) when idle. Hot plug not allowed. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jeff Garzik commit ca77329fb713b7fea6a307068e0dd0248e7aa640 Author: Kristen Carlson Accardi Date: Thu Oct 25 00:58:59 2007 -0400 [libata] Link power management infrastructure Device Initiated Power Management, which is defined in SATA 2.5 can be enabled for disks which support it. This patch enables DIPM when the user sets the link power management policy to "min_power". Additionally, libata drivers can define a function (enable_pm) that will perform hardware specific actions to enable whatever power management policy the user set up for Host Initiated Power management (HIPM). This power management policy will be activated after all disks have been enumerated and intialized. Drivers should also define disable_pm, which will turn off link power management, but not change link power management policy. Documentation/scsi/link_power_management_policy.txt has additional information. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Jeff Garzik commit f2b8544f5f50073fcc705e16b45a6821d50eb080 Author: David Howells Date: Mon Oct 29 13:15:39 2007 +0000 NOMMU: mm/nommu.c needs linux/module.h mm/nommu.c needs to #include linux/module.h for it to understand EXPORT_*() macros. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit cbf67812b2f1431c5e432ddecd202984c6882f2a Merge: 20dc9f0... 33013a8... Author: Linus Torvalds Date: Mon Oct 29 07:49:28 2007 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: compat_ioctl: fix block device compat ioctl regression [BLOCK] Fix bad sharing of tag busy list on queues with shared tag maps Fix a build error when BLOCK=n block: use lock bitops for the tag map. cciss: update copyright notices cfq_get_queue: fix possible NULL pointer access blk_sync_queue() should cancel request_queue->unplug_work cfq_exit_queue() should cancel cfq_data->unplug_work block layer: remove a unused argument of drive_stat_acct() commit 20dc9f01a867318ac0bc3ea9185d71f05076aeb0 Merge: 9340070... e1efa2a... Author: Linus Torvalds Date: Mon Oct 29 07:49:10 2007 -0700 Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block * 'sg' of git://git.kernel.dk/linux-2.6-block: Correction of "Update drivers to use sg helpers" patch for IMXMMC driver sg_init_table() should use unsigned loop index variable sg_last() should use unsigned loop index variable Initialise scatter/gather list in sg driver Initialise scatter/gather list in ata_sg_setup x86: fix pci-gart failure handling SG: s390-scsi: missing size parameter in zfcp_address_to_sg() SG: clear termination bit in sg_chain() commit 93400708dba888d45b4da01e1753a3a743f44496 Merge: db3a91f... edfed66... Author: Linus Torvalds Date: Mon Oct 29 07:47:05 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: Quieten hrtimer printk: "Switched to high resolution mode .." timer_list: Fix printk format strings clockevents: unexport tick_nohz_get_sleep_length commit ab6fc95f609b372a19e18ea689986846ab1ba29c Author: Jeff Garzik Date: Mon Oct 29 10:43:55 2007 -0400 [libata] AHCI: fix newly introduced host-reset bug The recent fix to host reset introduced a problem, whereby AHCI-enable bit would be cleared upon reset, if it was not asserted prior to reset. Unconditionally enable AHCI-enable bit. Signed-off-by: Jeff Garzik commit db3a91fe2b425c9adde47069efebdba44e665cef Author: Al Viro Date: Mon Oct 29 05:08:38 2007 +0000 deal with resource allocation bugs in arcmsr a) for type B we should _not_ iounmap() acb->pmu; it's not ioremapped. b) for type B we should iounmap() two regions we _do_ ioremap. c) if ioremap() fails, we need to bail out (and clean up). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 142956af525002c5378e7d91d81a01189841a785 Author: Al Viro Date: Mon Oct 29 05:11:28 2007 +0000 fix abuses of ptrdiff_t Use of ptrdiff_t in places like - if (!access_ok(VERIFY_WRITE, u_tmp->rx_buf, u_tmp->len)) + if (!access_ok(VERIFY_WRITE, (u8 __user *) + (ptrdiff_t) u_tmp->rx_buf, + u_tmp->len)) is wrong; for one thing, it's a bad C (it's what uintptr_t is for; in general we are not even promised that ptrdiff_t is large enough to hold a pointer, just enough to hold a difference between two pointers within the same object). For another, it confuses the fsck out of sparse. Use unsigned long or uintptr_t instead. There are several places misusing ptrdiff_t; fixed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0c7eb2eb800c4afb2205bbaa1bc633eb29082fef Author: Al Viro Date: Mon Oct 29 05:08:58 2007 +0000 fix reentrancy bug in arcmsr_get_iop_{r,w}qbuffer() doh... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6a7d26d58a0f61cffddc8839067dfad10413b852 Author: Al Viro Date: Mon Oct 29 05:08:48 2007 +0000 arcmsr: endianness bug initializing a field in data shared with the card with cpu_to_le32(something) | 0x100000 is broken - the field is, indeed, little-endian and we need cpu_to_le32() on both parts. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 80da1adbbf8805bc1a5d287ab171463710b7d92e Author: Al Viro Date: Mon Oct 29 05:08:28 2007 +0000 trivial annotations in arcmsr driver still has serious portability problems Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d06f608265d5fc41aefe2fae5b62da4893ecae35 Author: Al Viro Date: Mon Oct 29 05:03:23 2007 +0000 SCTP endianness annotations regression Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 4fe05bbcd53160616774b6f5619b8a55bcfa1c57 Author: Al Viro Date: Mon Oct 29 04:51:16 2007 +0000 intel-iommu fixes - off by one in dmar_get_fault_reason() (maximal index in array is ARRAY_SIZE()-1, not ARRAY_SIZE()) - NULL noise removal - __iomem annotation fix Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b4a08a10b12c145da67cc788849bf7cc6efaa210 Author: Al Viro Date: Mon Oct 29 04:36:10 2007 +0000 misc uml annotation and section fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27bb628a1d759cc82ff6360becf61de601907811 Author: Al Viro Date: Mon Oct 29 04:42:55 2007 +0000 missing atomic_read_long() in slub.c nr_slabs is atomic_long_t, not atomic_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2d8a972661832719931b0dd5b80e97215cb93d94 Author: Al Viro Date: Mon Oct 29 04:37:58 2007 +0000 SUNRPC endianness annotations rpcrdma stuff lacks endianness annotations for on-the-wire data. Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 7a78a1722380dd3cb5a009dbcd007f92b6b87743 Author: Al Viro Date: Mon Oct 29 04:34:31 2007 +0000 more x86 merge fallout (uml, again) arch/i386/{Kconfig,Makefile}.cpu got moved Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ca5cd877ae699e758e6f26efc11b01bf6631d427 Author: Al Viro Date: Mon Oct 29 04:31:16 2007 +0000 x86 merge fallout: uml Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places that required adjusting the ifdefs got those. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 360737a982b1ae09e1659e0bb27085c03f02f404 Author: Jeff Garzik Date: Mon Oct 29 06:49:24 2007 -0400 [libata] sata_nv: fix SWNCQ enabling Adapted from patches by Kuan Lou @ NVIDIA and Bartlomiej Zolnierkiewicz. Signed-off-by: Jeff Garzik commit 33013a881104304fcffe817f17f22a1588908037 Author: Philip Langdale Date: Sat Oct 27 13:34:10 2007 +0200 compat_ioctl: fix block device compat ioctl regression The conversion of handlers to compat_blkdev_ioctl accidentally disabled handling of most ioctl numbers on block devices because of a typo. Fix the one line to enable it all again. Signed-off-by: Arnd Bergmann Signed-off-by: Jens Axboe commit 6eca9004dfcb274a502438a591df5b197690afb1 Author: Jens Axboe Date: Thu Oct 25 10:14:47 2007 +0200 [BLOCK] Fix bad sharing of tag busy list on queues with shared tag maps For the locking to work, only the tag map and tag bit map may be shared (incidentally, I was just explaining this to Nick yesterday, but I apparently didn't review the code well enough myself). But we also share the busy list! The busy_list must be queue private, or we need a block_queue_tag covering lock as well. So we have to move the busy_list to the queue. This'll work fine, and it'll actually also fix a problem with blk_queue_invalidate_tags() which will invalidate tags across all shared queues. This is a bit confusing, the low level driver should call it for each queue seperately since otherwise you cannot kill tags on just a single queue for eg a hard drive that stops responding. Since the function has no callers currently, it's not an issue. Signed-off-by: Jens Axboe commit 3a424f2d56613acfb9e583ec9c85a2be3e3af028 Author: Emil Medve Date: Wed Oct 24 14:18:32 2007 +0200 Fix a build error when BLOCK=n mm/filemap.c: In function '__filemap_fdatawrite_range': mm/filemap.c:200: error: implicit declaration of function 'mapping_cap_writeback_dirty' This happens when we don't use/have any block devices and a NFS root filesystem is used. mapping_cap_writeback_dirty() is defined in linux/backing-dev.h which used to be provided in mm/filemap.c by linux/blkdev.h until commit f5ff8422bbdd59f8c1f699df248e1b7a11073027 (Fix warnings with !CONFIG_BLOCK). Signed-off-by: Emil Medve Signed-off-by: Jens Axboe commit adb4ddbbfb90c302e78da68b3f015588ca45d7f3 Author: Nick Piggin Date: Wed Oct 24 10:54:38 2007 +0200 block: use lock bitops for the tag map. The block queue tag map can use lock bitops. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit bd4f36d6da175ed51840fe07b8906951c4dea609 Author: Mike Miller Date: Wed Oct 24 10:30:34 2007 +0200 cciss: update copyright notices This patch updates the copyright information for the cciss driver. It includes extending the year to 2007 (how timely) and some minor corrections deemed necessary by HP legal and the Open Source Review Board. Please consider this patch for inclusion. Signed-off-by: Mike Miller -------------------------------------------------------------------------------- Signed-off-by: Jens Axboe commit 0a0836a09ca7a27341703ef154c82e2e7f3e96f4 Author: Oleg Nesterov Date: Tue Oct 23 15:08:21 2007 +0200 cfq_get_queue: fix possible NULL pointer access cfq_get_queue()->cfq_find_alloc_queue() can fail, check the returned value. Signed-off-by: Oleg Nesterov Note that this isn't a bug at the moment, since the regular IO path does not call this path without __GFP_WAIT set. However, it could be a future bug, so I've applied it. Signed-off-by: Jens Axboe commit abbeb88d00bef294ce661a9229c1dc31be064545 Author: Oleg Nesterov Date: Tue Oct 23 15:08:19 2007 +0200 blk_sync_queue() should cancel request_queue->unplug_work blk_sync_queue() cancels the timer, but forgets to cancel the work. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit 4310864b9d17714e64446bfb8bc7dbcb96454475 Author: Oleg Nesterov Date: Tue Oct 23 15:08:18 2007 +0200 cfq_exit_queue() should cancel cfq_data->unplug_work Spotted by Nick , perhaps explains the first trace in http://bugzilla.kernel.org/show_bug.cgi?id=9180. cfq_exit_queue() should cancel cfqd->unplug_work before freeing cfqd. blk_sync_queue() seems unneeded, removed. Q: why cfq_exit_queue() calls cfq_shutdown_timer_wq() twice? Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit b238b3d4be04d3acf1f86ff8ad0b0e803def67ff Author: Jerome Marchand Date: Tue Oct 23 15:05:46 2007 +0200 block layer: remove a unused argument of drive_stat_acct() The nr_sector argument of drive_stat_acct() is not used anymore since the read and write sectors statistics are now updated in end_that_request_first(). This patch removes the useless argument. Signed-off-by: Jerome Marchand Signed-off-by: Jens Axboe commit 9f336a53266f43ae1002f4aaad5373944589c828 Author: Robin Getz Date: Mon Oct 29 18:23:28 2007 +0800 Blackfin arch: ensure that speculative loads of bad pointers don't cause us to do bad things. Fix/change formatting of a few more things. Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 12850ffe71c677b30f62fc054925837f1fdc4266 Author: Tejun Heo Date: Mon Oct 29 17:57:44 2007 +0900 libata: add MAXTOR 7V300F0/VA111900 to NCQ blacklist MAXTOR 7V300F0/VA111900 does spurious NCQ completions. Add it to blacklist. This problem is reported by Carsten Otto. Signed-off-by: Tejun Heo Cc: Carsten Otto Signed-off-by: Jeff Garzik commit 4fb4615bc9465e7098665fa9616b6ac1f495f895 Author: Tejun Heo Date: Mon Oct 29 16:45:05 2007 +0900 libata: no need to speed down if already at PIO0 After reset, transfer mode is always PIO0 regardless of dev->xfer_mask. Check dev->pio_mode before trying to slow down after configuration failure. This prevents bogus speed down before device is actually configured. Signed-off-by: Tejun Heo Acked-by: Alan Cox Signed-off-by: Jeff Garzik commit cdeab1140799f09c5f728a5ff85e0bdfa5679cd2 Author: Tejun Heo Date: Mon Oct 29 16:41:09 2007 +0900 libata: relocate forcing PIO0 on reset Forcing PIO0 on reset was done inside ata_bus_softreset(), which is a bit out of place as it should be applied to all resets - hard, soft and implementation which don't use ata_bus_softreset(). Relocate it such that... * For new EH, it's done in ata_eh_reset() before calling prereset. * For old EH, it's done before calling ap->ops->phy_reset() in ata_bus_probe(). This makes PIO0 forced after all resets. Another difference is that reset itself is done after PIO0 is forced. Signed-off-by: Tejun Heo Acked-by: Alan Cox Signed-off-by: Jeff Garzik commit a9efacbad1a735ec410acb26c9de72be8efb33d5 Author: Frank Lichtenheld Date: Mon Oct 29 02:49:20 2007 +0100 pata_ns87415: define SUPERIO_IDE_MAX_RETRIES Code copied from drivers/ide/pci/ns87415.c uses this, so copy the definition from there as well. Fixes the following build error: CC [M] drivers/ata/pata_ns87415.o drivers/ata/pata_ns87415.c: In function ‘ns87560_read_buggy’: drivers/ata/pata_ns87415.c:228: error: ‘SUPERIO_IDE_MAX_RETRIES’ undeclared (first use in this function) drivers/ata/pata_ns87415.c:228: error: (Each undeclared identifier is reported only once drivers/ata/pata_ns87415.c:228: error: for each function it appears in.) Signed-off-by: Frank Lichtenheld Signed-off-by: Jeff Garzik commit 15b3ad6a4b348ea53ea1a45f9b166ac31c4b3f39 Author: Robin Getz Date: Mon Oct 29 18:17:07 2007 +0800 Blackfin arch: Add missing definitions of BF54x Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 5796d1c4c89efff823259fda35b08ea66ebf8b23 Author: Jeff Garzik Date: Fri Oct 26 00:03:37 2007 -0400 [libata] Address some checkpatch-spotted issues Signed-off-by: Jeff Garzik commit b447916e2b8c80f37aa88512ea39a05d5d11507d Author: Jeff Garzik Date: Thu Oct 25 20:47:30 2007 -0400 [libata] fix 'if(' and similar areas that lack whitespace Signed-off-by: Jeff Garzik commit 88ff6eafbb2a1c55f0f0e2e16d72e7b10d8ae8a5 Author: Tejun Heo Date: Tue Oct 16 14:21:24 2007 -0700 libata: implement ata_wait_after_reset() On certain device/controller combination, 0xff status is asserted after reset and doesn't get cleared during 150ms post-reset wait. As 0xff status is interpreted as no device (for good reasons), this can lead to misdetection on such cases. This patch implements ata_wait_after_reset() which replaces the 150ms sleep and waits upto ATA_TMOUT_FF_WAIT if status is 0xff. ATA_TMOUT_FF_WAIT is currently 800ms which is enough for HHD424020F7SV00 to get detected but not enough for Quantum GoVault drive which is known to take upto 2s. Without parallel probing, spending 2s on 0xff port would incur too much delay on ata_piix's which use 0xff to indicate empty port and doesn't have SCR register, so GoVault needs to wait till parallel probing. Signed-off-by: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 054a5fbaceb2eb3a31ea843c1cf0b8e10b91478c Author: Tejun Heo Date: Thu Oct 25 18:30:36 2007 +0900 libata: track SLEEP state and issue SRST to wake it up ATA devices in SLEEP mode don't respond to any commands. SRST is necessary to wake it up. Till now, when a command is issued to a device in SLEEP mode, the command times out, which makes EH reset the device and retry the command after that, causing a long delay. This patch makes libata track SLEEP state and issue SRST automatically if a command is about to be issued to a device in SLEEP. Signed-off-by: Tejun Heo Cc: Bruce Allen Cc: Andrew Paprocki Signed-off-by: Jeff Garzik commit 4dbfa39b6c95eb9d0aedb5bd00bb552b91c31e3d Author: Tejun Heo Date: Thu Oct 25 18:22:44 2007 +0900 libata: relocate and fix post-command processing Some commands need post-processing after successful completion. This was done in ata_scsi_qc_complete() till now but this has the following problems. * Post-command processing gets executed when qc is completed from EH. Some qc's are retried from EH with zero err_mask and thus triggers unnecessary/incorrect post-command processing. * Command post processing doesn't belong to SAT layer. * Link-wide revalidation was scheduled where device revalidation suffices. This patch moves post-command processing to success completion path of ata_qc_complete() which is travelled iff the command is going to be completed without passing through EH and updates post-command processing such that device-specific action is used. While at it, restructure code a bit for readability. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit aa770aa790f3a5f3ff568388d02aea2ef78773ec Author: Robin Getz Date: Mon Oct 29 18:14:15 2007 +0800 Blackfin arch: Fix random crash issue found by Michael. This is fixes a problem where we could jump to the wrong address. By doing a "p0 = reti; jump (p0)". If a different, higher level interrupt came in, just before, rather than returning to the calling function, we would return to a random place in the kernel. This very elegant fix from Bernd grabs the return location off the stack, and places it into P0, so when we do a return, it goes to the correct place. Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 7728ec33faf88605fb871b9b0ecf8e45d4359678 Author: Robin Getz Date: Mon Oct 29 18:12:15 2007 +0800 Blackfin arch: fix bug: tell users if the kernel is recovering from a fault condition Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 9030b3dd671d672f5fcc91c2ec48f02082310af4 Author: Joakim Tjernlund Date: Wed Oct 17 11:05:41 2007 +0200 Fix ethernet multicast for ucc_geth. hw_add_addr_in_hash() already swaps byte order, don't do it in ucc_geth_set_multi() too. Signed-off-by: Joakim Tjernlund Acked-by: ucc_geth maintainer Signed-off-by: Jeff Garzik commit 5e7bf8cc60d29354305cc76daa21a7d92745521c Author: Komuro Date: Sun Oct 28 11:26:17 2007 +0900 netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes. The drivers below support IRQ-sharing. 3c574_cs, 3c589_cs, pcnet_cs, axnet_cs, smc91c92_cs, fmvj18x_cs. xirc2ps_cs, serial_cs. Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit 4ad1ec7154d7e26c1bd82c03c44690ba2b566f2f Author: Mike Frysinger Date: Mon Oct 29 18:02:09 2007 +0800 Blackfin arch: add support for checking/clearing overruns in generic purpose Timer API Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 5d031e9e7e9ad5aa6516646f955c6262478e1acd Author: Domen Puncer Date: Fri Oct 26 18:07:49 2007 +0200 FEC - fast ethernet controller for mpc52xx Driver for ethernet on mpc5200/mpc5200b SoCs (FEC). Signed-off-by: Domen Puncer Acked-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 226eb1ef523a33c66193bc319a92c647e47311d4 Author: Robin Getz Date: Mon Oct 29 17:59:07 2007 +0800 Blackfin arch: cleanup arch/blackfin/kernel/traps.c handling code. - move the CONFIG_KGDB into one block, for easier reading - remove printk from printk_address, and pass around buffers. Also print out the labels when decoding CPLB errors, so you know exactly where the error was. - Do not use fixed addresses, becuase people do not know where they come from. - Turn the printing level down on the dump, so if you don't want, only the signal prints out - just like on other archs. If a kernel/interrupt crashes, it should dump everything all the time Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit af0900537f90b58fcfb7a7c821c661be8301fc9b Merge: 3830de7... d141786... Author: Jeff Garzik Date: Mon Oct 29 05:48:33 2007 -0400 Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes commit 3830de73000c07b2cbdf8cc31a46a01dda28c5df Merge: 2a6f4e4... 6ef89d0... Author: Jeff Garzik Date: Mon Oct 29 05:48:00 2007 -0400 Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 2a6f4e4983918b18fe5d3fb364afe33db7139870 Author: Jan-Bernd Themann Date: Fri Oct 26 14:37:28 2007 +0200 ehea: add kexec support eHEA resources that are allocated via H_CALLs have a unique identifier each. These identifiers are necessary to free the resources. A reboot notifier is used to free all eHEA resources before the indentifiers get lost, i.e before kexec starts a new kernel. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit f920c186be09718542dfa77f6ebe1814be7d35cb Author: Auke Kok Date: Thu Oct 25 13:58:03 2007 -0700 e1000e: Remove legacy jumbo frame receive code The legacy jumbo frame receive code is no longer needed since all hardware can do packet split and we're no longer offering a bypass kernel config option to disable packet split. Remove the unused code. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 140a74802894e9db57e5cd77ccff77e590ece5f3 Author: Auke Kok Date: Thu Oct 25 13:57:58 2007 -0700 e1000e: Re-enable SECRC - crc stripping This workaround code performed software stripping instead of the hardware which can do it much faster. None of the e1000e target hardware has issues with this feature and should work fine. This gives us some performance back on receive, and removes some kludging stripping the 4 bytes. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit df762464ad0fad721f9fc5724e85b3df0d550acd Author: Auke Kok Date: Thu Oct 25 13:57:53 2007 -0700 e1000e: Fix PBA calculation for jumbo frame packets Upon inspection the rx FIFO size calculation code was found to have 2 significant flaws: A superfluous minus sign resulting in the wrong size to be used for jumbo frames on 82573 and ich9, as well as that this code rewrote the read-only adapter->pba variable resulting in different values at each run. Without this patch jumbo's will work but performance will be awkward since the TX size is not adequate for two whole frames. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 47f44e40a3c12f8604aba9288d7a7f991cbf17ba Author: Auke Kok Date: Thu Oct 25 13:57:44 2007 -0700 e1000e: Fix jumbo frame receive code. Fix allocation and freeing of jumbo frames where several bugs were recently introduced by cleanups after we forked this code from e1000. This moves ps_pages to buffer_info where it really belongs and makes it a dynamically allocated array. The penalty is not that high since it's allocated outside of the buffer_info struct anyway. Without this patch all jumbo frames are completely broken and the driver panics. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit e38c2c651a038b78fd01cf2e3f3a65cacf0e41cc Author: Jeff Garzik Date: Mon Oct 29 05:18:12 2007 -0400 drivers/net/irda/au1k_ir: fix obvious irq handler bugs interrupt handlers return a return value these days. Also, kill always-true test and unneeded void* cast. Signed-off-by: Jeff Garzik commit a15c2dcff2766edb92d9433e3de8ae7d7c081be5 Author: Michael Hennerich Date: Mon Oct 29 17:31:18 2007 +0800 Blackfin arch: Apply Bluetchnix vendor patch provided by Harald Krapfenbauer Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 8ecc73687b560698e63ef78614ac8aba7f565594 Author: Michael Hennerich Date: Mon Oct 29 17:24:23 2007 +0800 Blackfin arch: fix bug BlueTechnix CM-BF537 board config uses wrong IRQ for net2272 driver Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 885be03b069131d242506f0f717d38659b2bdb6c Author: Robin Getz Date: Mon Oct 29 17:20:41 2007 +0800 Blackfin arch: fix bug: kernel prints out error message twice This fixes two things: - stop calling write_lock_irq/write_unlock_irq which can turn modify irq levels - don't calling mmput when handing exceptions - since this might_sleep, which does a rti, and leaves us in kernel space (irq15, rather than irq5). Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 64307f7db3690140a16c6748e65068f8a279877c Author: Michael Hennerich Date: Mon Oct 29 16:55:18 2007 +0800 Blackfin arch: add NFC driver support in BF527-EZKIT board Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit b393243fe7b711eb18eafaaf469bdb39317adf5b Author: Jeff Garzik Date: Thu Oct 25 23:02:14 2007 -0400 [ISDN] capidrv: address two longstanding warnings * change #warning to a code comment * add comment and special ifdef'd 64-bit code for a situation where we must store a pointer into a CAPI field 'Data', which is fixed by the interface at 32 bits. Signed-off-by: Jeff Garzik Acked-by: Karsten Keil commit edfed66e17854c312e81a2218f9b0592a555c9a3 Author: Michael Ellerman Date: Mon Oct 29 16:35:29 2007 +1100 Quieten hrtimer printk: "Switched to high resolution mode .." Change the hrtimer printk "Switched to high resolution mode .." to be KERN_DEBUG, rather than KERN_INFO. If users need to see this they can pass "loglevel" or "debug" on the command line, or check dmesg. Signed-off-by: Michael Ellerman Signed-off-by: Thomas Gleixner kernel/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 129f1d2c5352eea3f7c8af9f8c1006dc0da7be52 Author: Vegard Nossum Date: Thu Oct 11 08:23:34 2007 +0200 timer_list: Fix printk format strings This makes sure printk format strings contain no more than a single line. Signed-off-by: Vegard Nossum Signed-off-by: Thomas Gleixner commit 64e38eb082bd845d6758079f65b191203986336d Author: Adrian Bunk Date: Wed Oct 24 18:24:22 2007 +0200 clockevents: unexport tick_nohz_get_sleep_length This patch removes the unused EXPORT_SYMBOL_GPL(tick_nohz_get_sleep_length). Signed-off-by: Adrian Bunk Signed-off-by: Thomas Gleixner commit e1efa2a3ea266e093f690c20af7522d95540f74f Author: Pavel Pisa Date: Fri Oct 26 19:29:49 2007 +0200 Correction of "Update drivers to use sg helpers" patch for IMXMMC driver The previous change omits "data->" prefix in the "data->sg" case. This change fixes kernel compilation. Signed-off-by: Pavel Pisa drivers/mmc/host/imxmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Signed-off-by: Jens Axboe commit 513f54b78f9594927ede66b6c66a70c1bae0c4ca Author: Chuck Lever Date: Fri Oct 26 19:29:48 2007 +0200 sg_init_table() should use unsigned loop index variable Clean up: fix a mixed sign comparison in sg_init_table() accidentally introduced by commit d6ec0842. The sign of the loop index variable should match the sign of the "nents" argument. Signed-off-by: Chuck Lever Cc: Jens Axboe Signed-off-by: Jens Axboe commit 74eb94f7b84f4e631a0e020991fb16f17ce85ab7 Author: Chuck Lever Date: Fri Oct 26 19:29:47 2007 +0200 sg_last() should use unsigned loop index variable Clean up: fix a mixed sign comparison in sg_last() accidentally introduced by commit 70eb8040. The sign of the loop index variable should match the sign of the "nents" argument. Signed-off-by: Chuck Lever Signed-off-by: Jens Axboe commit 30fa0d0f0c0ab2aa0d4c2f88eda49eaa19ea6f8d Author: Anton Blanchard Date: Fri Oct 26 14:00:14 2007 +0200 Initialise scatter/gather list in sg driver After turning on DEBUG_SG I hit a fail: kernel BUG at include/linux/scatterlist.h:50! sg_build_indirect sg_build_reserve sg_open chrdev_open __dentry_open do_filp_open do_sys_open We should initialise the sg list when we allocate it in sg_build_sgat. Signed-off-by: Anton Blanchard Signed-off-by: Jens Axboe commit acd054a5ef401e03e0047b487e572442614f81e5 Author: Anton Blanchard Date: Fri Oct 26 13:59:44 2007 +0200 Initialise scatter/gather list in ata_sg_setup After turning on DEBUG_SG I hit a fail: kernel BUG at include/linux/scatterlist.h:50! ata_qc_issue ata_scsi_translate ipr_queuecommand scsi_dispatch_cmd scsi_request_fn elv_insert blk_execute_rq_nowait blk_execute_rq sg_io scsi_cmd_ioctl cdrom_ioctl sr_block_ioctl blkdev_driver_ioctl blkdev_ioctl block_ioctl do_ioctl vfs_ioctl sys_ioctl sg_ioctl_trans It looks like ata_sg_setup is working on an uninitialised sg table. Call sg_init_table to initialise it before use. Signed-off-by: Anton Blanchard Note: this patch will fix it, but you could also get away with just doing the sg_init_table() once at qc creation time. Signed-off-by: Jens Axboe commit 5336940dd8b11180a0340ba886db62f728377d19 Author: FUJITA Tomonori Date: Fri Oct 26 13:56:24 2007 +0200 x86: fix pci-gart failure handling blk_rq_map_sg doesn't initialize sg->dma_address/length to zero anymore. Some low level drivers reuse sg lists without initializing so IOMMUs might get non-zero dma_address/length. If map_sg fails, we need pass the number of the mapped entries to gart_unmap_sg. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit 9335432959111c982c74177521305e6a3fb600a3 Author: Jens Axboe Date: Fri Oct 26 13:55:40 2007 +0200 SG: s390-scsi: missing size parameter in zfcp_address_to_sg() Signed-off-by: Jens Axboe commit 73fd546aa75e9db02526bf304d4f736c4ec82b4b Author: Jens Axboe Date: Fri Oct 26 09:32:16 2007 +0200 SG: clear termination bit in sg_chain() Since we are using the last entry in the list, clear any possible termination bit that may have already been set. Pointed out by Rusty. Signed-off-by: Jens Axboe commit ab472a0484cdcea1dc050c08563b9c869128e2e3 Author: Javier Herrero Date: Mon Oct 29 16:14:44 2007 +0800 Blackfin arch: Added support for HV Sistemas H8606 board Signed-off-by: Javier Herrero Signed-off-by: Bryan Wu commit 2a397e82c7db18019e408f953dd58dc1963a328c Merge: ea45d15... 8588a2b... Author: Linus Torvalds Date: Sun Oct 28 12:03:14 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: add SH-S202J to ivb_list[] drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n hpt366: fix build for CONFIG_HOTPLUG=n cy82c693: fix build for CONFIG_HOTPLUG=n commit d1417862d7355f0b395d83f2884afd614b086695 Author: Francois Romieu Date: Sun Oct 21 12:19:27 2007 +0200 ipg: Kconfig whitepaces/tab damages Signed-off-by: Francois Romieu Cc: Avuton Olrich Cc: Jesse Huang Cc: Sorbica Shieh commit bbd82f956e0db6190b16a8a00d3ed5d979f488e8 Author: Francois Romieu Date: Sun Oct 21 12:17:51 2007 +0200 ipg: missing Kconfig dependency Fix for the error below while linking vmlinux: [...] drivers/built-in.o: In function `ipg_ioctl': drivers/net/ipg.c:2148: undefined reference to `generic_mii_ioctl' drivers/built-in.o: In function `ipg_get_settings': drivers/net/ipg.c:2181: undefined reference to `mii_ethtool_gset' drivers/built-in.o: In function `ipg_set_settings': drivers/net/ipg.c:2193: undefined reference to `mii_ethtool_sset' drivers/built-in.o: In function `ipg_nway_reset': drivers/net/ipg.c:2205: undefined reference to `mii_nway_restart' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Francois Romieu Cc: Avuton Olrich Cc: Jesse Huang Cc: Sorbica Shieh commit 93dd79e87bbc98ef02610d54fe72d4a1931ee15e Author: Stephen Hemminger Date: Sun Oct 28 17:14:06 2007 +0100 r8169: remove poll_locked logic Disabling napi polling early is well enough. Signed-off-by: Stephen Hemminger Signed-off-by: Francois Romieu Cc: Edward Hsu commit 7fab06c0ca89d99442a4baeddf417add585e2672 Author: Stephen Hemminger Date: Sun Oct 28 17:10:08 2007 +0100 r8169: napi config Don't call napi_disable if not configured and make sure that any misuse of napi_xxx in future fails with a compile error. Signed-off-by: Stephen Hemminger Signed-off-by: Francois Romieu Cc: Edward Hsu commit ea45d15394c57cb214aef8e6d40976c128995d43 Author: Al Viro Date: Sat Oct 27 21:20:02 2007 +0100 duplicate initializer in sound/pci/hda/patch_realtek.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 30e69bf4cce16d4c2dcfd629a60fcd8e1aba9fee Author: Al Viro Date: Sat Oct 27 21:02:32 2007 +0100 fix breakage in pegasos_eth Fix fallout from commit b45d9147f1582333e180e1023624c003874b7312 ("mv643xx_eth: Remove unused register defines") Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6e1b97d899401035dd9d02b0fd93ad54641f867a Merge: 36ea96a... 69243f9... Author: Linus Torvalds Date: Sat Oct 27 22:18:55 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: Dump filtering supports x86_64 sparsemem x86: fix compiler warnings in arch/x86/kernel/early-quirks.c x86: fix !SMP compiler warning in arch/x86/kernel/acpi/processor.c x86: Fix boot protocol KEEP_SEGMENTS check. x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info x86: export smp_ops to allow modular build of KVM Revert "i386: export i386 smp_call_function_mask() to modules" commit 36ea96a485ce09a88819896e48468d6469c292ab Author: Al Viro Date: Sat Oct 27 19:46:58 2007 +0100 cirrusfb nonsense (pointer > 0) is deeply weird; (pointer >= 0) is even dumber... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0ada7a02ad870f8586176ff5c4f0db2a40ba3fab Author: Al Viro Date: Sat Oct 27 19:40:46 2007 +0100 scatterlist fallout: mmc #include is an odd thing to do... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4a66fcabd0e4a7a3ae78b662dfa4ddfd27bbe206 Author: Al Viro Date: Sat Oct 27 19:39:23 2007 +0100 ide/arm/icside: fallout from commit 86f3a492bb09eee5745b93af35f2212179c251fd struct device doesn't have ->dma; it's in struct expansion_card where that struct device is embedded into. Signed-off-by: Al Viro Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds commit 9e6a76b8bb814d0e53473ebe55d4fa18ba89ce77 Author: Al Viro Date: Sat Oct 27 19:23:30 2007 +0100 scatterlist fallout: frv Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 69243f91257083795065762ce805120b980e256b Author: Ken'ichi Ohmichi Date: Fri Oct 26 14:19:26 2007 +0900 x86: Dump filtering supports x86_64 sparsemem This patch adds the symbol "init_level4_pgt" to the vmcoreinfo data so that makedumpfile (dump filtering command) supports x86_64 sparsemem kernel of linux-2.6.24. makedumpfile creates a small dumpfile by excluding unnecessary pages for the analysis. It checks attributes in page structures and distinguishes necessary pages and unnecessary ones. To check them, makedumpfile gets the vmcoreinfo data which has the minimum debugging information only for dump filtering. For older x86_64 kernel (linux-2.6.23 or before), makedumpfile translates the virtual address of page structure into physical address by subtracting PAGE_OFFSET from virtual address, but this translation isn't effective for linux-2.6.24 sparsemem kernel, because its page structures are in virtual memmap area. makedumpfile should translate their virtual address by 4-levels paging and it needs the symbol "init_level4_pgt". Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Thomas Gleixner commit 03d0d20e640a6189ec85fa917259d94013b4d730 Author: Jeff Garzik Date: Sat Oct 27 20:57:43 2007 +0200 x86: fix compiler warnings in arch/x86/kernel/early-quirks.c fix this warning: arch/x86/kernel/early-quirks.c:40: warning: nvidia_hpet_check defined but not used Signed-off-by: Jeff Garzik Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 74a3d2d331246a12428b027e21d508679187fcf0 Author: Jeff Garzik Date: Sat Oct 27 20:57:43 2007 +0200 x86: fix !SMP compiler warning in arch/x86/kernel/acpi/processor.c Fix !CONFIG_SMP warning: arch/x86/kernel/acpi/processor.c: In function arch_acpi_processor_init_pdc: arch/x86/kernel/acpi/processor.c:65: warning: unused variable cpu Signed-off-by: Jeff Garzik Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit bd53147db8bdf5dd49025c198ff18ac23f560e0e Author: Eric W. Biederman Date: Fri Oct 26 11:29:04 2007 -0600 x86: Fix boot protocol KEEP_SEGMENTS check. The kernel only ever supports 1 version of the boot protocol so there is no need to check the boot protocol revision to see if a feature is supported. Both x86 and x86_64 support the same boot protocol so we need to implement the KEEP_SEGMENTS on x86_64 as well. It isn't just paravirt bootloaders that could use this functionality. Signed-off-by: Eric W. Biederman Cc: Jeremy Fitzhardinge Cc: Rusty Russell Cc: Vivek Goyal Cc: James Bottomley Cc: Zachary Amsden Cc: Andi Kleen Acked-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0cca1ca647d87c2c0b0d76d2f32683ce34d54989 Author: James Bottomley Date: Fri Oct 26 12:17:19 2007 -0500 x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info There were two problems. Firstly, someone forgot the struct keyword in front of cpuinfo_x86, so I take it this wasn't even compile checked. Secondly, the actual definition has this as a SHARED_ALIGNED, so the definitions mismatch. Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 027447c4913c8fd6f91092b92dfa07eec91f009d Author: Thomas Gleixner Date: Sat Oct 27 20:57:43 2007 +0200 x86: export smp_ops to allow modular build of KVM KVM uses smp_call_function_mask and therefor need smp_ops to be exported. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit ceff8d859c77981147c320da4074dcf8a06501a4 Author: Thomas Gleixner Date: Fri Oct 26 17:22:17 2007 +0200 Revert "i386: export i386 smp_call_function_mask() to modules" This reverts commit 6442eea937ef797d4b66733f49c82e2fdc2aca6f. The patch breaks smp_ops and needs to be reverted. The solution to allow modular build of KVM is to export smp_ops instead. Pointed-out-by: James Bottomley tglx, so write out 100 times "voyager is a useful architecture" ... yes, Sir Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit ef49c32b8489a845a54ca4689b17bfbf8db9bf9e Merge: 3d1343b... 6d85d06... Author: Linus Torvalds Date: Sat Oct 27 10:14:04 2007 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [JFFS2] Update MAINTAINERS entry -- the jffs-dev list is dead [JFFS2] Prevent return of initialised variable in jffs2_init_acl_post() commit 3d1343b55643d60839d711205076e75754e9126e Merge: a2508c0... 460cd05... Author: Linus Torvalds Date: Sat Oct 27 10:12:39 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc_spi: Fix mmc-over-spi regression mmc: use common byte swap macros mmc: fix cid and csd byte order at91_mci: Fix bad reference commit a2508c0814c6d2c0259fa859a6184343b1e39ea3 Merge: 0f5a2c5... 6ee4e28... Author: Linus Torvalds Date: Sat Oct 27 10:11:12 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: [SPARC32]: Fix build-warning in io-unit.c [SPARC64]: Fix BACKOFF_SPIN on non-SMP. [SPARC32]: __inline__ --> inline [SPARC64]: __inline__ --> inline commit 0f5a2c553d1484141ebb369ecab61894e9cb074f Merge: 26adc0d... 68e3f5d... Author: Linus Torvalds Date: Sat Oct 27 10:10:40 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: [CRYPTO] users: Fix up scatterlist conversion errors [CRYPTO] tcrypt: Move sg_init_table out of timing loops [NETNS]: Fix get_net_ns_by_pid [NET]: Marking struct pernet_operations __net_initdata was inappropriate [INET] ESP: Must #include [TCP] IPV6: fix softnet build breakage commit 6d85d06673db74ec7ff4aa31e47b1e2e7a5af7cb Author: David Woodhouse Date: Sat Oct 27 10:39:48 2007 -0400 [JFFS2] Update MAINTAINERS entry -- the jffs-dev list is dead Signed-off-by: David Woodhouse commit 8d6ea587d94569919bd2c31c042d5b9b8734e351 Author: David Woodhouse Date: Sat Oct 27 10:36:44 2007 -0400 [JFFS2] Prevent return of initialised variable in jffs2_init_acl_post() Spotted by the Coverity checker, and pointed out by Adrian Bunk. Signed-off-by: David Woodhouse commit 460cd0589df8aa9b89599905b13c2010db627012 Author: David Brownell Date: Sat Oct 27 14:47:20 2007 +0200 mmc_spi: Fix mmc-over-spi regression Patch 49dce689ad4ef0fd1f970ef762168e4bd46f69a3 changed the sysfs data structures for SPI in a way which broke the MMC-over-SPI host driver. This patch fixes that regression by changing the scheme used to keep from knowingly trying to use a shared bus segment, and updates the adjacent comments slightly to better explain the issue. Signed-off-by: David Brownell Signed-off-by: Pierre Ossman commit 1fa8dd146f6bf57902602522c212040f8fa6fcd3 Author: Pierre Ossman Date: Sat Oct 27 14:41:04 2007 +0200 mmc: use common byte swap macros Use the more generic byte swapping macros instead of the socket variants. Signed-off-by: Pierre Ossman commit 78e480731ab89e311ecdb455d04903cafbe163ca Author: Pierre Ossman Date: Sat Oct 27 14:14:23 2007 +0200 mmc: fix cid and csd byte order MMC over SPI sends the CID and CSD registers as data, not responses, which means that the host driver won't do the necessary byte flipping for us. Signed-off-by: Pierre Ossman commit 6356a9d955e1898eadaa8cba9a5137b1787c0c7e Author: Pierre Ossman Date: Mon Oct 22 18:16:16 2007 +0200 at91_mci: Fix bad reference The flags parameter got removed in a previous commit, but some references were overlooked. Signed-off-by: Pierre Ossman commit 6ee4e28be80add86a64908472e4b7ab01dab33d9 Author: David S. Miller Date: Sat Oct 27 00:54:14 2007 -0700 [SPARC32]: Fix build-warning in io-unit.c Signed-off-by: David S. Miller commit 68e3f5dd4db62619fdbe520d36c9ebf62e672256 Author: Herbert Xu Date: Sat Oct 27 00:52:07 2007 -0700 [CRYPTO] users: Fix up scatterlist conversion errors This patch fixes the errors made in the users of the crypto layer during the sg_init_table conversion. It also adds a few conversions that were missing altogether. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a5a613a4291a8107008e4c40108a385cda71b08d Author: Herbert Xu Date: Sat Oct 27 00:51:21 2007 -0700 [CRYPTO] tcrypt: Move sg_init_table out of timing loops This patch moves the sg_init_table out of the timing loops for hash algorithms so that it doesn't impact on the speed test results. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0aa031d9e047f22679e5ad4069667ec1d22b39dc Author: David S. Miller Date: Sat Oct 27 00:23:22 2007 -0700 [SPARC64]: Fix BACKOFF_SPIN on non-SMP. It can't be just empty, it has to at least branch back to 'label'. Signed-off-by: David S. Miller commit 64d329eec0313a071edd8176faf0a803012796d7 Author: David S. Miller Date: Sat Oct 27 00:17:01 2007 -0700 [SPARC32]: __inline__ --> inline Signed-off-by: David S. Miller commit d979f1792d1a4867eda0028b3aac8c6d4a535bb7 Author: David S. Miller Date: Sat Oct 27 00:13:04 2007 -0700 [SPARC64]: __inline__ --> inline Signed-off-by: David S. Miller commit ceaa79c434044e40031585a65a4e45dc09322e8f Author: Eric W. Biederman Date: Fri Oct 26 22:56:12 2007 -0700 [NETNS]: Fix get_net_ns_by_pid The pid namespace patches changed the semantics of find_task_by_pid without breaking the compile resulting in get_net_ns_by_pid doing the wrong thing. So switch to using the intended find_task_by_vpid. Combined with Denis' earlier patch to make netlink traffic fully synchronous the inadvertent race I introduced with accessing current is actually removed. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 2b008b0a8e96b726c603c5e1a5a7a509b5f61e35 Author: Eric W. Biederman Date: Fri Oct 26 22:54:53 2007 -0700 [NET]: Marking struct pernet_operations __net_initdata was inappropriate It is not safe to to place struct pernet_operations in a special section. We need struct pernet_operations to last until we call unregister_pernet_subsys. Which doesn't happen until module unload. So marking struct pernet_operations is a disaster for modules in two ways. - We discard it before we call the exit method it points to. - Because I keep struct pernet_operations on a linked list discarding it for compiled in code removes elements in the middle of a linked list and does horrible things for linked insert. So this looks safe assuming __exit_refok is not discarded for modules. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 72998d8c84247817c4b8b05b0256f29453e435f5 Author: Adrian Bunk Date: Fri Oct 26 22:53:58 2007 -0700 [INET] ESP: Must #include This patch fixes the following compile errors in some configurations: <-- snip --> ... CC net/ipv4/esp4.o /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c: In function 'esp_output': /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c:113: error: implicit declaration of function 'sg_init_table' make[3]: *** [net/ipv4/esp4.o] Error 1 ... /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c: In function 'esp6_output': /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c:112: error: implicit declaration of function 'sg_init_table' make[3]: *** [net/ipv6/esp6.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 18134bed02e230a7876570072b0284635daaa32b Author: Jeff Garzik Date: Fri Oct 26 22:53:14 2007 -0700 [TCP] IPV6: fix softnet build breakage net/ipv6/tcp_ipv6.c: In function 'tcp_v6_rcv': net/ipv6/tcp_ipv6.c:1736: error: implicit declaration of function 'get_softnet_dma' net/ipv6/tcp_ipv6.c:1736: warning: assignment makes pointer from integer without a cast Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 26adc0d5859788b74f86677538236f807e6d9021 Merge: 0e4bd10... e6e1ace... Author: Linus Torvalds Date: Fri Oct 26 13:56:01 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: x86 setup: sizeof() is unsigned, unbreak comparisons x86 setup: handle boot loaders which set up the stack incorrectly commit 0e4bd10c9b7e9ed65132f5935328275deb760384 Merge: ec3b67c... 208652d... Author: Linus Torvalds Date: Fri Oct 26 13:49:29 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86 * git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86: x86: kill the old i386 and x86_64 directories x86: move i386 and x86_64 Kconfig files to x86 directory kconfig: small code refactoring in kconfig Makefile x86: unification of i386 and x86_64 Kconfig.debug x86: move defconfig files for i386 and x86_64 to x86 x86: move i386 and x86_64 Makefiles to arch/x86 commit 8588a2b732928b343233af9b1855705b8286bed4 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 26 20:31:16 2007 +0200 ide: add SH-S202J to ivb_list[] From the report by Nick Warne. Tested-by: Nick Warne Cc: Lennart Sorensen Signed-off-by: Bartlomiej Zolnierkiewicz commit 9d434813641abb5d619224e165f391bf352b202b Author: Jeff Garzik Date: Fri Oct 26 20:31:15 2007 +0200 drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings * We shouldn't bother with dev->current_state, the PCI API functions we call manage this for us (and do a far better job at it too). * Remove pci_set_power_state(dev, PCI_D0) call in resume, as pci_enable_device() does the same thing. * Check pci_enable_device() return value. If it failed, fail the entire resume and avoid programming timings into the [potentially dead/asleep] chip. Signed-off-by: Jeff Garzik Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit d5271be6b5601b3749cccd8ee89941d5868b90bf Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 26 20:31:15 2007 +0200 drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n It turns out that const and __{dev}initdata cannot be mixed currently and that generic IDE PCI host driver is also affected by the same issue: On Thursday 25 October 2007, Ralf Baechle wrote: > CC drivers/ide/pci/generic.o > drivers/ide/pci/generic.c:52: error: __setup_str_ide_generic_all_on causes a > +section type conflict [ Also reported by Martijn Uffing . ] This patch workarounds the problem in a bit hackish way but without removing const from generic_chipsets[] (it adds const to __setup() so __setup_str_ide_generic_all becomes const). Now all __{dev}initdata data in generic IDE PCI host driver are read-only so it builds again (driver's .init.data section gets marked as READONLY). Cc: Martijn Uffing Cc: Ralf Baechle Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 282037f17f1db66f555b40eedef1215a5f4b36af Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 26 20:31:15 2007 +0200 hpt366: fix build for CONFIG_HOTPLUG=n On Saturday 20 October 2007, Avuton Olrich wrote: > My randconfig script the attached config caught an error on: > drivers/ide/pci/cy82c693.c:439: error: primary causes a section type conflict > > My git tree: c00046c279a2521075250fad682ca0acc10d4fd7 > > Bisected to: > 8562043606430185cad26d085d46adcc7ad67fd1 is first bad commit > commit 8562043606430185cad26d085d46adcc7ad67fd1 > Author: Bartlomiej Zolnierkiewicz > Date: Sat Oct 20 00:32:34 2007 +0200 > > ide: constify struct ide_port_info > > Signed-off-by: Bartlomiej Zolnierkiewicz It turns out that const and __{dev}initdata cannot be mixed currently and that hpt366 host driver is also affected by the same issue: > drivers/ide/pci/hpt366.c:1428: error: hpt366_chipsets causes a section type > conflict This patch workarounds the problem by making static struct hpt_info instances const. Now all __devinitdata data in hpt366 host driver are read-only so it builds again (driver's .init.data section gets marked as READONLY). While at it: * Bump driver version. Cc: Sergei Shtylyov Cc: "Avuton Olrich" Cc: Randy Dunlap Signed-off-by: Bartlomiej Zolnierkiewicz commit f32d26ae2649c17df742f8db48b438eba2c38400 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 26 20:31:15 2007 +0200 cy82c693: fix build for CONFIG_HOTPLUG=n On Saturday 20 October 2007, Avuton Olrich wrote: > My randconfig script the attached config caught an error on: > drivers/ide/pci/cy82c693.c:439: error: primary causes a section type conflict > > My git tree: c00046c279a2521075250fad682ca0acc10d4fd7 > > Bisected to: > 8562043606430185cad26d085d46adcc7ad67fd1 is first bad commit > commit 8562043606430185cad26d085d46adcc7ad67fd1 > Author: Bartlomiej Zolnierkiewicz > Date: Sat Oct 20 00:32:34 2007 +0200 > > ide: constify struct ide_port_info > > Signed-off-by: Bartlomiej Zolnierkiewicz It turns out that const and __{dev}initdata cannot be mixed currently. This patch workarounds the problem by removing __devinitdata tag from 'primary' variable (which makes 'primary' to be moved from .init.data to .bss section). Now all __devinitdata data in cy82c693 host driver are read-only so it builds again (driver's .init.data section gets marked as READONLY). While at it: * Move 'primary' variable to its only user, init_iops_cy82c693(). * Bump driver version. Cc: "Avuton Olrich" Cc: Randy Dunlap Signed-off-by: Bartlomiej Zolnierkiewicz commit ec3b67c11df42362ccda81261d62829042f223f0 Merge: e868171... 4be2700... Author: Linus Torvalds Date: Fri Oct 26 08:43:05 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits) [NetLabel]: correct usage of RCU locking [TCP]: fix D-SACK cwnd handling [NET] napi: use non-interruptible sleep in napi_disable [SCTP] net/sctp/auth.c: make 3 functions static [TCP]: Add missing I/O AT code to ipv6 side. [SCTP]: #if 0 sctp_update_copy_cksum() [INET]: Unexport icmpmsg_statistics [NET]: Unexport sock_enable_timestamp(). [TCP]: Make tcp_match_skb_to_sack() static. [IRDA]: Make ircomm_tty static. [NET] fs/proc/proc_net.c: make a struct static [NET] dev_change_name: ignore changes to same name [NET]: Document some simple rules for actions [NET_CLS_ACT]: Use skb_act_clone [NET_CLS_ACT]: Introduce skb_act_clone [TCP]: Fix scatterlist handling in MD5 signature support. [IPSEC]: Fix scatterlist handling in skb_icv_walk(). [IPSEC]: Add missing sg_init_table() calls to ESP. [CRYPTO]: Initialize TCRYPT on-stack scatterlist objects correctly. [CRYPTO]: HMAC needs some more scatterlist fixups. ... commit e868171a94b637158a3930c9adfb448d0df163cd Author: Alexey Dobriyan Date: Fri Oct 26 12:17:22 2007 +0400 De-constify sched.h [PATCH] De-constify sched.h This reverts commit a8972ccf00b7184a743eb6cd9bc7f3443357910c ("sched: constify sched.h") 1) Patch doesn't change any code here, so gcc is already smart enough to "feel" constness in such simple functions. 2) There is no such thing as const task_struct. Anyone who think otherwise deserves compiler warning. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 4be2700fb7b95f2a7cef9324879cafccab8774fc Author: Paul Moore Date: Fri Oct 26 04:29:08 2007 -0700 [NetLabel]: correct usage of RCU locking This fixes some awkward, and perhaps even problematic, RCU lock usage in the NetLabel code as well as some other related trivial cleanups found when looking through the RCU locking. Most of the changes involve removing the redundant RCU read locks wrapping spinlocks in the case of a RCU writer. Signed-off-by: Paul Moore Signed-off-by: David S. Miller commit 94d3b1e586f6d4c7150501bde284c544ce99073c Author: Ryousei Takano Date: Fri Oct 26 04:27:59 2007 -0700 [TCP]: fix D-SACK cwnd handling In the current net-2.6 kernel, handling FLAG_DSACKING_ACK is broken. The flag is cleared to 1 just after FLAG_DSACKING_ACK is set. if (found_dup_sack) flag |= FLAG_DSACKING_ACK; : flag = 1; To fix it, this patch introduces a part of the tcp_sacktag_state patch: http://marc.info/?l=linux-netdev&m=119210560431519&w=2 Signed-off-by: Ryousei Takano Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 43cc7380eced27ee9cafdf89fa32333dc3884e8b Author: Benjamin Herrenschmidt Date: Fri Oct 26 04:23:22 2007 -0700 [NET] napi: use non-interruptible sleep in napi_disable The current napi_disable() uses msleep_interruptible() but doesn't (and can't) exit in case there's a signal, thus ending up doing a hot spin without a cpu_relax. Use uninterruptible sleep instead. Signed-off-by: Benjamin Herrenschmidt Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 8ad7c62b752483982a678c78a52a70f498b84cbb Author: Adrian Bunk Date: Fri Oct 26 04:21:23 2007 -0700 [SCTP] net/sctp/auth.c: make 3 functions static This patch makes three needlessly global functions static. Signed-off-by: Adrian Bunk Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit b4caea8aa8b4caeda2af6ef6b7f0d43c516815ee Author: David S. Miller Date: Fri Oct 26 04:20:13 2007 -0700 [TCP]: Add missing I/O AT code to ipv6 side. Signed-off-by: David S. Miller commit d84d64dcb3b54c900113f8dcd1240205ae164922 Author: Adrian Bunk Date: Fri Oct 26 04:07:20 2007 -0700 [SCTP]: #if 0 sctp_update_copy_cksum() sctp_update_copy_cksum() is no longer used. Signed-off-by: Adrian Bunk Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit 39296ed6699df34fdfbf1b14281c07321a079a3d Author: Adrian Bunk Date: Fri Oct 26 04:06:08 2007 -0700 [INET]: Unexport icmpmsg_statistics This patch removes the unused EXPORT_SYMBOL(icmpmsg_statistics). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit bbbb1a812de596958163779ae5b0806bc53a83f4 Author: Adrian Bunk Date: Fri Oct 26 03:59:45 2007 -0700 [NET]: Unexport sock_enable_timestamp(). sock_enable_timestamp() no longer has any modular users. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 0f79efdc23bd82035625083adf441e063a61f170 Author: Adrian Bunk Date: Fri Oct 26 03:57:36 2007 -0700 [TCP]: Make tcp_match_skb_to_sack() static. tcp_match_skb_to_sack() can become static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit d76081f87548f986fd318d2b0dd7e942f93a0da4 Author: Adrian Bunk Date: Fri Oct 26 03:56:43 2007 -0700 [IRDA]: Make ircomm_tty static. ircomm_tty can now become static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 253879e62f997d0027500f4b71ef290f37e306ee Author: Adrian Bunk Date: Fri Oct 26 03:55:44 2007 -0700 [NET] fs/proc/proc_net.c: make a struct static Struct proc_net_ns_ops can become static. Signed-off-by: Adrian Bunk Acked-by: "Eric W. Biederman" Signed-off-by: David S. Miller commit c8d90dca3211966ba5189e0f3d4bccd558d9ae08 Author: Stephen Hemminger Date: Fri Oct 26 03:53:42 2007 -0700 [NET] dev_change_name: ignore changes to same name Prevent error/backtrace from dev_rename() when changing name of network device to the same name. This is a common situation with udev and other scripts that bind addr to device. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8c56a347c1dfbe384b1ffb65d8828faa36dbaea4 Merge: d892afe... 24c667d... Author: David S. Miller Date: Fri Oct 26 03:50:02 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 commit d892afe2ca905ddb00a4f16927c8b465cdd31b20 Author: Jamal Hadi Salim Date: Fri Oct 26 02:49:09 2007 -0700 [NET]: Document some simple rules for actions This patch adds documentation on what is expected of an action which branches away from the action-graph or when it needs to trample on actins. It also describes what is expected of users of such actions. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit a057ae3c104dd2c661e55d2af37e70d168c65e00 Author: Jamal Hadi Salim Date: Fri Oct 26 02:47:54 2007 -0700 [NET_CLS_ACT]: Use skb_act_clone clean skb_clone of any signs of CONFIG_NET_CLS_ACT and have mirred us skb_act_clone() Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 12da81d11a34d3bdef52d731cc75f7ec72d0e815 Author: Jamal Hadi Salim Date: Fri Oct 26 02:47:23 2007 -0700 [NET_CLS_ACT]: Introduce skb_act_clone Reworked skb_clone looks uglier with the single ifdef CONFIG_NET_CLS_ACT This patch introduces skb_act_clone which will replace skb_clone in tc actions Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c7da57a183a255f53caa73b1f688a01b097fa5bc Author: David S. Miller Date: Fri Oct 26 00:41:21 2007 -0700 [TCP]: Fix scatterlist handling in MD5 signature support. Use sg_init_table() and sg_mark_end() as needed. Signed-off-by: David S. Miller commit 0e0940d4bb9b19c0a45c844a83e1d25686aaf433 Author: David S. Miller Date: Fri Oct 26 00:39:27 2007 -0700 [IPSEC]: Fix scatterlist handling in skb_icv_walk(). Use sg_init_one() and sg_init_table() as needed. Signed-off-by: David S. Miller commit ed0e7e0ca370519d6f79d1093ee2890d4cdee744 Author: David S. Miller Date: Fri Oct 26 00:38:39 2007 -0700 [IPSEC]: Add missing sg_init_table() calls to ESP. Signed-off-by: David S. Miller commit b733588559fc13547a59ccf81651c775b8f2719c Author: David S. Miller Date: Fri Oct 26 00:38:10 2007 -0700 [CRYPTO]: Initialize TCRYPT on-stack scatterlist objects correctly. Use sg_init_one() and sg_init_table() as needed. Signed-off-by: David S. Miller commit a6767721a563acb172c73f693fcf719b3b3d6716 Author: David S. Miller Date: Fri Oct 26 00:37:12 2007 -0700 [CRYPTO]: HMAC needs some more scatterlist fixups. hmac_setkey(), hmac_init(), and hmac_final() have a singular on-stack scatterlist. Initialit is using sg_init_one() instead of using sg_set_buf(). Signed-off-by: David S. Miller commit 564262c1f0b0f0ce852ecd7f60672f79985595ee Author: Ryousei Takano Date: Thu Oct 25 23:03:52 2007 -0700 [TCP]: Fix inconsistency of terms. Fix inconsistency of terms: 1) D-SACK 2) F-RTO Signed-off-by: Ryousei Takano Signed-off-by: David S. Miller commit 4bc3e17cce5662092703b02ee7b030047b1c99b3 Merge: fee9dee... ddd6858... Author: David S. Miller Date: Thu Oct 25 22:49:43 2007 -0700 Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit ddd68587d0470498eb161de37b8f9fb5c48786a3 Author: Johannes Berg Date: Mon Oct 22 14:51:37 2007 +0200 [PATCH] mac80211: fix printk warning on 64-bit My AID message patch introduced a warning on 64-bit machines because ~ extends to unsigned long: | net/mac80211/ieee80211_sta.c: In function ‘ieee80211_rx_mgmt_assoc_resp’: | net/mac80211/ieee80211_sta.c:1187: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘long unsigned int’ This fixes it by explicitly casting the result to u16 (which 'aid' is). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e6e1ace9904b72478f0c5a5aa7bd174cb6f62561 Author: H. Peter Anvin Date: Thu Oct 25 16:09:38 2007 -0700 x86 setup: sizeof() is unsigned, unbreak comparisons We use signed values for limit checking since the values can go negative under certain circumstances. However, sizeof() is unsigned and forces the comparison to be unsigned, so move the comparison into the heap_free() macros so we can ensure it is a signed comparison. Signed-off-by: H. Peter Anvin commit 6b6815c6d5d1dc209701d1661a7a0e09a295db2f Author: H. Peter Anvin Date: Thu Oct 25 16:11:33 2007 -0700 x86 setup: handle boot loaders which set up the stack incorrectly Apparently some specific versions of LILO enter the kernel with a stack pointer that doesn't match the rest of the segments. Make our best attempt at untangling the resulting mess. Signed-off-by: H. Peter Anvin commit 31c7cecb616e499dd30703959710aebeee3f9af1 Author: Johannes Berg Date: Tue Oct 23 17:05:25 2007 +0200 [PATCH] add myself as mac80211 maintainer This adds myself as mac80211 maintainer and updates the git URL to point to the wireless-2.6 tree. Also move Jiri down so he isn't first in list. Signed-off-by: Johannes Berg Acked-by: Michael Wu Signed-off-by: John W. Linville commit 48225709bec68c2d8612718922f974f22214a308 Author: Michael Wu Date: Fri Oct 19 17:14:36 2007 -0400 [PATCH] mac80211: Fix SSID matching in AP selection The length of the SSID desired should also be compared in addition to the memcmp of the SSIDs. Thanks to Andrea Merello for finding this issue. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit 6ef89d0afabe472dd17caff85cec2f9cefeb5f06 Author: Mohamed Abbas Date: Thu Oct 25 17:15:47 2007 +0800 [PATCH] iwl3945: fix direct scan problem This patch fix the follwing for 3945: 1. Fix direct scan by make sure we set one_direct_scan only when the mac80211 ask for direct scan. 2. Fix mac_stop and mac_remove_interface calles, we make sure we cancel any scan and disassoc on these call Signed-off-by: Mohamed Abbas Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 15e869d86ee349f5510cf93f6b61e3a5e415c35f Author: Mohamed Abbas Date: Thu Oct 25 17:15:46 2007 +0800 [PATCH] iwl3945: cancel scan on rxon command This patch fixes the following for 3945: 1. Make sure we cancel scan if RXON command is called. 2. Call scan abort on scan watchdog. Signed-off-by: Mohamed Abbas Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 948c171cfe9c63102cfb530af8a4b64e9643dde9 Author: Mohamed Abbas Date: Thu Oct 25 17:15:45 2007 +0800 [PATCH] iwl4965: fix scan problem This patch fixes the following problems for 4965: 1. Fix direct scan by make sure we set one_direct_scan only when the mac80211 ask for direct scan. 2. Fix mac_stop and mac_remove_interface calles, we make sure we cancel any scan and disassoc on these call. Signed-off-by: Mohamed Abbas Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 052c4b9f0a83a83f3fee735b57c5b1e4edc1da8c Author: mabbas Date: Thu Oct 25 17:15:43 2007 +0800 [PATCH] iwl4965: fix driver hang related to hardware scan This patch fix the following: 1. make sure we are not scanning before we call REPLY_RXON 2. set RXON_FILTER_ASSOC_MSK only after we receive association response 3. call scan abort on scan watchdog instead of restart Signed-off-by: Mohamed Abbas Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 702004b7455e0c4dcf875dd2f638d611892ea84f Author: Tomas Winkler Date: Thu Oct 25 17:15:33 2007 +0800 [PATCH] iwlwifi: fix sending probe request in iwl 4965 This patch removeis TSF flag from probe request. TSF should be added only to probe response. Signed-off-by: Helmut Schaa Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 2fe142636b079c8facba49f80e3c311e58130e6b Author: Michael Wu Date: Sat Oct 20 20:05:31 2007 -0400 [PATCH] rtl8187: Allow multicast frames This patch allows rtl8187 to receive multicast frames if requested. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit 82cd682d56e2a6bbb46d31076cdd9a62c667a2b4 Author: Anton Blanchard Date: Mon Oct 15 00:42:23 2007 -0500 [PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative When rounding a relative timeout we need to use round_jiffies_relative(). Signed-off-by: Anton Blanchard Signed-off-by: John W. Linville commit b239bd759869a82bbb8ecf94ff10634b6829313d Author: Anton Blanchard Date: Mon Oct 15 00:40:34 2007 -0500 [PATCH] rt2x00: jiffies_round -> jiffies_round_relative When rounding a relative timeout we need to use round_jiffies_relative(). Signed-off-by: Anton Blanchard Signed-off-by: John W. Linville commit be84e3d673ed32353e5504313dd1a5f5cc2f6ba6 Author: Anton Blanchard Date: Mon Oct 15 00:38:01 2007 -0500 [PATCH] ipw2100/ipw2200: jiffies_round -> jiffies_round_relative When rounding a relative timeout we need to use round_jiffies_relative(). Signed-off-by: Anton Blanchard Signed-off-by: John W. Linville commit fee9dee730a40f671c1972a324ed54f0d68523e1 Author: Vlad Yasevich Date: Thu Oct 25 18:54:46 2007 -0700 [UDP]: Make use of inet_iif() when doing socket lookups. UDP currently uses skb->dev->ifindex which may provide the wrong information when the socket bound to a specific interface. This patch makes inet_iif() accessible to UDP and makes UDP use it. The scenario we are trying to fix is when a client is running on the same system and the server and both client and server bind to a non-loopback device. Signed-off-by: Vlad Yasevich Acked-by: David L Stevens Signed-off-by: David S. Miller commit 41fb285430e9cb57da624d838afef7b2fc67e276 Author: Vlad Yasevich Date: Thu Oct 25 18:46:26 2007 -0700 [CRYPTO]: Fix hmac_digest from the SG breakage. Crypto now uses SG helper functions. Fix hmac_digest to use those functions correctly and fix the oops associated with it. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 8a6911b12f7a835055f3236c6cf7073f79ba0730 Author: David S. Miller Date: Thu Oct 25 18:40:05 2007 -0700 [IPV4]: Remove no longer used snmp4_icmp_list. This was obsoleted by a previous change, but the removal was forgotten. Reported by David Howells and David Stevens. Signed-off-by: David S. Miller commit ade8c56cbd02020fecbe1684f181250a466685eb Author: Randy Dunlap Date: Thu Oct 25 14:27:24 2007 -0700 x86 bitops: fix code style issues Coding style cleanups: - change __inline__ to inline; - drop space in "* addr" parameters; - drop space between func. name and '(' The "volatile" keywords are correct according to email from one Linus Torvalds. [Several other arches need some of this also.] Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit fb9431eb038caa027cb98cb18576f1a731e56f76 Author: Randy Dunlap Date: Thu Oct 25 14:21:49 2007 -0700 bitops kernel-doc: inline instead of macro Use duplicated inline functions for test_and_set_bit_lock() on x86 instead of #define macros, thus avoiding a bad example. This allows kernel-doc to run cleanly instead of terminating with an error: Error(linux-2.6.24-rc1//include/asm-x86/bitops_32.h:188): cannot understand prototype: 'test_and_set_bit_lock test_and_set_bit ' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a60387ba3114fe087349df23fa82e5ad9d5b6ff2 Merge: 0e81bef... d5d1cea... Author: Linus Torvalds Date: Thu Oct 25 15:58:40 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (40 commits) USB: open disconnect race in usblcd USB: disconnect open race in legousbtower USB: open disconnect race in iowarrior USB: missing error check in emi62 USB: missing error check in emi26 USB: usb_serial_resume bug fix USB: remove new OHCI build warnings USB: amd5536udc - remove set_mwi() compiler warning USB: usbserial - fix potential deadlock between write() and IRQ usb: serial/pl2303: support for IO Data Device RSAQ5 USB: fix read vs. disconnect race in cytherm driver USB: fix locking in idmouse USB: fix interface sysfs file-creation bug USB: fix ssb_ohci_probe() build bug USB: pl2303: remove can't happen checks, set speed properly and report baud rate USB: mos7840: Clean up old checks and stuff USB rio500.c: fix check-after-use USB iowarrior.c: fix check-after-use USB: add URB_FREE_BUFFER to permissible flags USB: isd200: sort out USB/IDE dependancy mess ... commit 0e81bef05e3b90f8319e79bf36e61341f7b6e189 Merge: eadd4f5... 9317d43... Author: Linus Torvalds Date: Thu Oct 25 15:58:18 2007 -0700 Merge branch 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: ISDN/sc: fix longstanding warning commit eadd4f5ea1507403655e9f5aeb0ea944eaa9d5de Merge: 06dbbfe... d58aa8c... Author: Linus Torvalds Date: Thu Oct 25 15:50:48 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED) commit 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c Merge: 22fa8d5... 03cf786... Author: Linus Torvalds Date: Thu Oct 25 15:50:32 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Explicitly call fib_get_table() in fib_frontend.c [NET]: Use BUILD_BUG_ON in net/core/flowi.c [NET]: Remove in-code externs for some functions from net/core/dev.c [NET]: Don't declare extern variables in net/core/sysctl_net_core.c [TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update() [NET]: Treat the sign of the result of skb_headroom() consistently [9P]: Fix missing unlock before return in p9_mux_poll_start [PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE [IPV4] ip_gre: sendto/recvfrom NBMA address [SCTP]: Consolidate sctp_ulpq_renege_xxx functions [NETLINK]: Fix ACK processing after netlink_dump_start [VLAN]: MAINTAINERS update [DCCP]: Implement SIOCINQ/FIONREAD [NET]: Validate device addr prior to interface-up commit 22fa8d59be28affbecc6ae87abf528aebeebff24 Merge: 7f14957... eec407c... Author: Linus Torvalds Date: Thu Oct 25 15:48:05 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix bogus KERN_ALERT on oops x86: lguest build fix x86: fix CONFIG_KEXEC build breakage commit 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 Merge: 2c75055... 85cdffc... Author: Linus Torvalds Date: Thu Oct 25 15:44:54 2007 -0700 Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block * 'sg' of git://git.kernel.dk/linux-2.6-block: fix sg_phys to use dma_addr_t ub: add sg_init_table for sense and read capacity commands x86: pci-gart fix blackfin: fix sg fallout xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it SG: audit of drivers that use blk_rq_map_sg() arch/um/drivers/ubd_kern.c: fix a building error SG: Change sg_set_page() to take length and offset argument AVR32: Fix sg_page breakage mmc: sg fallout m68k: sg fallout More SG build fixes sg: add missing sg_init_table calls to zfcp SG build fix commit 2c7505570353af02e48c58ab4d109edd9bbbdd81 Merge: fc42dab... e1e7296... Author: Linus Torvalds Date: Thu Oct 25 15:38:19 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: lguest: documentation update lguest: Add to maintainers file. lguest: build fix lguest: clean up lguest_launcher.h lguest: remove unused "wake" element from struct lguest lguest: use defines from x86 headers instead of magic numbers lguest: example launcher header cleanup. commit fc42dabe465d478311423039448d9dc9051e5f6b Merge: 2304c3a... e2e031e... Author: Linus Torvalds Date: Thu Oct 25 15:20:22 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: SWNCQ should not apply to MCP61 libata-core: Be a bit more relaxed about early DMA zero devices ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2 Fix pata_icside build for recent libata API changes libata: cosmetic clean up in ata_eh_reset() libata-core.c: make 2 functions static [libata] Create internal helper ata_dev_set_feature() commit 2304c3ac3634d2de59f71f7b2c58aab05959124b Merge: fcd0580... 96fd4cd... Author: Linus Torvalds Date: Thu Oct 25 15:19:59 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] forcedeth: add MCP77 device IDs rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size cpmac: update to new fixed phy driver interface cpmac: convert to napi_struct interface cpmac: use print_mac() instead of MAC_FMT natsemi: fix oops, link back netdevice from private-struct ehea: fix port_napi_disable/enable bonding/bond_main.c: fix cut'n'paste error make bonding/bond_main.c:bond_deinit() static drivers/net/ipg.c: cleanups remove Documentation/networking/net-modules.txt commit fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0 Merge: f9e8348... 8ef93cf... Author: Linus Torvalds Date: Thu Oct 25 15:19:03 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: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL sched: isolate SMP balancing code a bit more sched: reduce balance-tasks overhead sched: make cpu_shares_{show,store}() static sched: clean up some control group code sched: constify sched.h sched: document profile=sleep requiring CONFIG_SCHEDSTATS sched: use show_regs() to improve __schedule_bug() output sched: clean up sched_domain_debug() sched: fix fastcall mismatch in completion APIs sched: fix sched_domain sysctl registration again commit f9e83489cbb3670df810d4f9fe308cde88faa0a9 Author: Ram Gupta Date: Thu Oct 25 10:03:28 2007 -0500 fs: Fix to correct the mbcache entries counter This patch fixes the c_entry_count counter of the mbcache. Currently it increments the counter first & allocate the cache entry later. In case of failure to allocate the entry due to insufficient memory this counter is still left incremented. This patch fixes this anomaly. Signed-off-by: Ram Gupta Signed-off-by: Linus Torvalds commit 2a2da53b181bdafcdecb43c457735ee2892ae885 Author: David Howells Date: Thu Oct 25 15:27:40 2007 +0100 Fix pointer mismatches in proc_sysctl.c Fix pointer mismatches in proc_sysctl.c. The proc_handler() method returns a size_t through an arg pointer, but is given a pointer to a ssize_t to return into. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit de48844398f81cfdf087d56e12c920d620dae8d5 Author: Jeff Garzik Date: Thu Oct 25 04:06:13 2007 -0400 Permit silencing of __deprecated warnings. The __deprecated marker is quite useful in highlighting the remnants of old APIs that want removing. However, it is quite normal for one or more years to pass, before the (usually ancient, bitrotten) code in question is either updated or deleted. Thus, like __must_check, add a Kconfig option that permits the silencing of this compiler warning. This change mimics the ifdef-ery and Kconfig defaults of MUST_CHECK as closely as possible. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit c67c36e4b86872ac875716d502748b84b2541de5 Author: Linus Torvalds Date: Wed Oct 17 23:18:32 2007 -0400 Fix /proc/acpi/alarm BCD alarm encodings This fixes some totally illogical and wrong code that converts things to and from BCD mode essentially randomly, does math on values in BCD mode etc etc. Introduce a few helper functions to make it a bit more obvious what is going on, and make sure that we always do all the arithmetic (and anythign else, for that matter) in binary, not BCD. Tested by Mark Lord, who found the problem originally, and also pushed the patch back and reminded me about it. Signed-off-by: Mark Lord Signed-off-by: Linus Torvalds commit a0ce317ae7d8ea99aea2c3f1a8ef0a99bab99a30 Author: Len Brown Date: Thu Oct 25 18:05:49 2007 -0400 suspend: MAINTAINERS update > I guess it is time to clarify that suspend and hibernation are separate > things, and add Rafael as a maintainer. Plus, people blame us for suspend > problems, anyway, I guess it is fair to mark us as suspend maintainers, too. If blame is the qualification, I guess I'm already part of this merry band:-) Change to Supported from Maintained, as the folks that sign my paycheck agree it is a good idea for me to help out on suspend. Acked-by: Pavel Machek Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 38e09d83e99b6c7ceb03c42046e0c2ec4850c94d Author: Len Brown Date: Thu Oct 25 17:55:59 2007 -0400 ACPI: update MAINTAINERS Newly minted project home page -- http://www.lesswatts.org/projects/acpi/ Konstantin moved on, so default back to Len for Thermal/Fan. Rui replaces Luming on video. Signed-off-by: Len Brown commit b023b43a83d231d1f3d36ac9e3ce4831b5ec2e7b Author: Adrian Bunk Date: Wed Oct 24 18:25:49 2007 +0200 fujitsu-laptop.c: remove dead code This patch removes dead code spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Jonathan Woithe Signed-off-by: Len Brown commit 4d8b4e1e02b4bb200e81b2efc915da6ce59d5d72 Author: Adrian Bunk Date: Wed Oct 24 18:24:22 2007 +0200 cpuidle: unexport tick_nohz_get_sleep_length This patch removes the unused EXPORT_SYMBOL_GPL(tick_nohz_get_sleep_length), which we no long user b/c we no longer build optional modules. Signed-off-by: Adrian Bunk Acked-by: Venkatesh Pallipadi Acked-by: Thomas Gleixner Signed-off-by: Len Brown commit b19073a0be5e317d626b3b404e0039b59383891c Author: Alexey Starikovskiy Date: Thu Oct 25 17:10:47 2007 -0400 ACPI: battery: Update battery information upon sysfs read. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit b6f03ae6defb61bb4b8e7a8e4b9081a1dd1d3ef9 Author: Adrian Bunk Date: Wed Oct 24 18:23:16 2007 +0200 fujitsu-laptop: make 2 functions static acpi_fujitsu_{add,remove}() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jonathan Woithe Signed-off-by: Len Brown commit 208652d6b2cb9d7155ca8ff8691c8ef88c8250af Author: Sam Ravnborg Date: Thu Oct 25 21:06:56 2007 +0200 x86: kill the old i386 and x86_64 directories The last remaining bits were two .gitignore files. Deleting them and the directories are history. Signed-off-by: Sam Ravnborg commit 1544fdbc857cbe8afca16a521d3254346befeb06 Author: Adrian Bunk Date: Wed Oct 24 18:26:00 2007 +0200 ACPI: EC: fix use-after-free This patch fixes a use-after-free introduced by commit 30c08574da0ead1a47797ce028218ce5b2de61c7 (ACPI: EC: Add new query handler to list head) Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 47572387d58a9584c60ebbbdee56fc92c627f16f Author: Sam Ravnborg Date: Thu Oct 25 21:04:16 2007 +0200 x86: move i386 and x86_64 Kconfig files to x86 directory After a small change in kconfig Makefile we could move all x86 Kconfig files to x86 directory. Signed-off-by: Sam Ravnborg commit e703f75d620824739148142c3734ae8223e4d1f5 Author: Sam Ravnborg Date: Thu Oct 25 20:42:18 2007 +0200 kconfig: small code refactoring in kconfig Makefile Do not hardcode the arch/$(ARCH)/Kconfig name all over Signed-off-by: Sam Ravnborg commit d013a27cb79a01b324f93adb275162c244cca2de Author: Randy Dunlap Date: Wed Oct 24 15:50:43 2007 -0700 x86: unification of i386 and x86_64 Kconfig.debug Adding proper dependencies so the two Kconfig.debug files are now identical and move the result file to x86. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit c9e4172cde0f793dbf48c99bdfd0abe7d18e4b09 Author: Adrian Bunk Date: Wed Oct 24 18:25:37 2007 +0200 ACPI: battery: remove dead code After commit f1d4661abe05d0a2c014166042d15ed8b69ae8f2 this was dead code. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 93ad7c07ad487b036add8760dabcc35666a550ef Author: Alexey Starikovskiy Date: Mon Oct 22 14:19:21 2007 +0400 ACPI: Fan: Drop force_power_state acpi_device option force_power_state was used as a workaround for invalid cached power state of the device. We do not cache power state, so no need for workaround. Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 968fc5dc2699434ea1cbddaf189f19c4eb4dbe55 Author: Alexey Starikovskiy Date: Mon Oct 22 14:19:15 2007 +0400 ACPI: Fan: fan device does not need own structure Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit c35923bc558074d4f5e6f9706e4cb9811ae55775 Author: Alexey Starikovskiy Date: Mon Oct 22 14:19:09 2007 +0400 ACPI: power: don't cache power resource state ACPI may change power resource state behind our back, so don't keep our local copy, which may not be valid. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 95b937e3f52a7f5546c4bffe29886fe400bad1d1 Author: Alexey Starikovskiy Date: Mon Oct 22 14:19:03 2007 +0400 ACPI: EC: Output changes to operational mode Insert printk() for every change in operational mode. Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 66c5f4e7367b0085652931b2f3366de29e7ff5ec Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:56 2007 +0400 ACPI: EC: Add workaround for "optimized" controllers Some controllers do not send interrupts for OBF=1 event, but send them for IBF=0. Add workaround for them. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=8459 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 1c55053c21706ccf1fdb26b4bb6d05c4a2782ffe Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:50 2007 +0400 ACPI: EC: Don't re-enable GPE for each transaction. With the auto selection of operation mode, absence of GPEs does not really degrade performance, so let PM code to handle enabling/disabling GPEs. This is a revert of 5d57a6a55ec0bdcb952dbcd3f8ffcde8a3ee9413, which was meant to be temporary. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=7977 Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 7843932ac42899b936085beaea8620d4489b8b3f Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:43 2007 +0400 ACPI: EC: auto select interrupt mode Start in POLL mode, and if we receive confirmation GPE, switch to INT mode. If confirmations are not sent, switch back to POLL. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 0c5d31f48e54b2e56e9cef8d49ffedaef1e0ea52 Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:36 2007 +0400 ACPI: EC: Don't expect interrupt after last read There is no interrupt after last read according to spec, so don't set bit that we are expecting one. Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 080e412cc0bdb9ef8e7a983d5e008537e1c4d36c Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:30 2007 +0400 ACPI: EC: Replace atomic variables with bits Number of flags is about to be increased, so it is better to put them all into bits. No functional changes. Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 23de5d9ef2a4bbc4f733f58311bcb7cf6239c813 Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:18 2007 +0400 ACPI: button: send initial lid state after add and resume Input layer should know about initial state of lid switch, even before first notify. Reference: https://bugzilla.novell.com/show_bug.cgi?id=326814 Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 1dbc1fda5d8ca907f320b806005d4a447977d26a Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:12 2007 +0400 ACPI: suspend: Wrong order of GPE restore. acpi_leave_sleep_state() should have correct list of wake and runtime GPEs, which is available only after disable_wakeup_device() is called. Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 9c1c6a1ba786d58bd03e27ee49f89a5685e8e07b Author: Alexey Starikovskiy Date: Mon Oct 22 14:18:06 2007 +0400 ACPI: sleep: Fix GPE suspend cleanup Commit 9b039330808b83acac3597535da26f47ad1862ce removed acpi_gpe_sleep_prepare(), the only function used at S5 transition Add call to generic acpi_enable_wake_device(). Reference: https://bugzilla.novell.com/show_bug.cgi?id=299882 Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2266cfd50de3872e877eeca3dd4a6f940f22ba60 Author: Sam Ravnborg Date: Thu Oct 25 20:31:19 2007 +0200 x86: move defconfig files for i386 and x86_64 to x86 With some small changes to kconfig makefile we can now locate the defconfig files for i386 and x86_64 in the configs/ subdirectory under x86. make ARCH=i386 defconfig and make defconfig works as expected also after this change. But arch maintainers shall now update a defconfig file in the configs/ directory. Signed-off-by: Sam Ravnborg commit 74b469f2e6b1589118b6ac05c7256add01e572d2 Author: Sam Ravnborg Date: Thu Oct 25 19:42:04 2007 +0200 x86: move i386 and x86_64 Makefiles to arch/x86 Moving the ARCH specific Makefiles for i386 and x86_64 required a litle bit tweaking in the top-lvel Makefile. SRCARCH is now set in the top-level Makefile because we need this info to include the correct arch Makefile. Signed-off-by: Sam Ravnborg commit d5d1ceac2a47645780bd07fd7a670b14c4d995db Author: Oliver Neukum Date: Thu Oct 25 16:05:53 2007 +0200 USB: open disconnect race in usblcd this driver has a possible use after free due to a race when disconnect and open handle intfdata without a lock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 78663ecc344b4694dd737deb682e81312a0684b6 Author: Oliver Neukum Date: Thu Oct 25 15:48:39 2007 +0200 USB: disconnect open race in legousbtower again, possible use after free due to touching intfdata without lock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 03f36e885fc26cb0ea299fb6df5171a51e814548 Author: Oliver Neukum Date: Thu Oct 25 15:46:30 2007 +0200 USB: open disconnect race in iowarrior the driver sets intfdata to NULL without lock. Data structures can be freed and accessed. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5919a43bbc649f4770b8b5db33f43136c7ff3153 Author: Oliver Neukum Date: Thu Oct 25 15:42:38 2007 +0200 USB: missing error check in emi62 the emi62 also lacks an error check. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit cf4cf0bb89cbff95c5be8f8d3c68e55f38f94ba7 Author: Oliver Neukum Date: Thu Oct 25 15:38:44 2007 +0200 USB: missing error check in emi26 this drivers lacks an error check. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319 Author: Sarah Sharp Date: Thu Oct 25 10:58:43 2007 -0700 USB: usb_serial_resume bug fix Avoid potential null pointer dereference. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit da6fb5704feeadd10b99a1025166f1a3f627825d Author: David Brownell Date: Wed Oct 24 17:23:42 2007 -0700 USB: remove new OHCI build warnings Remove various newly-introduced compiler warnings for OHCI. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 51745281b0bf56312b78d8f56afb970cd7c91137 Author: David Brownell Date: Wed Oct 24 18:44:08 2007 -0700 USB: amd5536udc - remove set_mwi() compiler warning Get rid of pointless pci_set_mwi() compiler warning. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit acd2a847e7fee7df11817f67dba75a2802793e5d Author: Jiri Kosina Date: Sat Oct 20 00:05:19 2007 +0200 USB: usbserial - fix potential deadlock between write() and IRQ USB: usbserial - fix potential deadlock between write() and IRQ usb_serial_generic_write() doesn't disable interrupts when taking port->lock, and could therefore deadlock with usb_serial_generic_read_bulk_callback() being called from interrupt, taking the same lock. Fix it. Signed-off-by: Jiri Kosina Acked-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 8a28dea3accda319d51a1bf4d3e280771d946f78 Author: Masakazu Mokuno Date: Tue Oct 23 13:51:57 2007 +0900 usb: serial/pl2303: support for IO Data Device RSAQ5 This patch adds support for the IO Data Device USB-RSAQ5, PL2303 based USB-serial converter, to pl2303 driver Signed-off-by: Masakazu Mokuno Signed-off-by: Greg Kroah-Hartman commit d718d2b17822bb92708204cb1a9175e512520261 Author: Oliver Neukum Date: Tue Oct 23 12:26:41 2007 +0200 USB: fix read vs. disconnect race in cytherm driver the disconnect method of this driver set intfdata to NULL before removing attribute files. The attributes' read methods will happily follow the NULL pointer. Here's the correct ordering. Signed-off-by : Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 54d2bc068fd21bcb096660938bce7c7265613a24 Author: Oliver Neukum Date: Tue Oct 23 14:23:13 2007 +0200 USB: fix locking in idmouse Pete caused me to lock at buggy drivers in this respect. The idmouse has a race between open and disconnect. This patch - solves the open/disconnect race - switches locking to mutexes Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 439a903a9663c0caa8094f3907ca60069d6c36e7 Author: Alan Stern Date: Fri Oct 19 09:51:58 2007 -0400 USB: fix interface sysfs file-creation bug This patch (as1005) fixes a rather subtle problem. When usb_set_configuration() registers the interfaces and their files in sysfs, it doesn't expect those files to exist already. But when an interface is registered, its driver may call usb_set_interface() and thereby cause the sysfs files to be created. The result is an error when usb_set_configuration() goes on to create those same files again. The (not-so-great) solution is to have usb_set_configuration() remove any existing files before creating them. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b22817b3c81cdb18ffe3d2debfee968731a8b5f4 Author: Ingo Molnar Date: Mon Oct 15 19:43:21 2007 +0200 USB: fix ssb_ohci_probe() build bug fix ssb_ohci_probe() build bug: drivers/built-in.o: In function `ssb_ohci_probe': ohci-hcd.c:(.text+0xbff39): undefined reference to `ssb_device_enable' ohci-hcd.c:(.text+0xbff6f): undefined reference to `ssb_admatch_base' ohci-hcd.c:(.text+0xbff8b): undefined reference to `ssb_admatch_size' ohci-hcd.c:(.text+0xbffe5): undefined reference to `ssb_device_disable' [...] the reason was that this Kconfig combination was allowed: CONFIG_SSB=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y the fix is to require a modular USB_OHCI_HCD build when SSB is modular. Signed-off-by: Ingo Molnar Acked-by: Michael Buesch Signed-off-by: Greg Kroah-Hartman commit df64c47184aedf34fd2a69a4b7f68584fe982fdf Author: Alan Cox Date: Mon Oct 15 20:54:47 2007 +0100 USB: pl2303: remove can't happen checks, set speed properly and report baud rate Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 3d3ddce568b79911bc893b9e8542f7e1d3bc72c7 Author: Alan Cox Date: Mon Oct 15 20:53:35 2007 +0100 USB: mos7840: Clean up old checks and stuff Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 3328d9752f3796a5f5f8695d27a175c34407a5ed Author: Adrian Bunk Date: Thu Oct 18 12:53:07 2007 +0200 USB rio500.c: fix check-after-use The Coverity checker spotted that we have already oops'ed if "dev" was NULL in these places. Since "dev" being NULL isn't possible at these places this patch removes the NULL checks. Additionally, I've fixed the formatting of the if's. Signed-off-by: Adrian Bunk Acked-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit e28c6a77061ab28bd2f0b57e400e3e58cd3474ca Author: Adrian Bunk Date: Thu Oct 18 12:52:50 2007 +0200 USB iowarrior.c: fix check-after-use The Coverity checker spotted that we have already oops'ed if "dev" was NULL. Since "dev" being NULL doesn't seem to be possible here this patch removes the NULL check. Signed-off-by: Adrian Bunk Acked-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 0b28baaf74ca04be2e0cc4d4dd2bbc801697f744 Author: Oliver Neukum Date: Wed Oct 17 14:37:54 2007 +0200 USB: add URB_FREE_BUFFER to permissible flags URB_FREE_BUFFER needs to be allowed in the sanity checks to use drivers that use that flag. Signed-off-by: Oliver Neukum Acked-by: Marcel Holtmann Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3794ade5b286cbd4551009dd341dbe9aeead2bc3 Author: Alan Cox Date: Mon Oct 15 15:08:11 2007 +0100 USB: isd200: sort out USB/IDE dependancy mess The ISD200 driver imports a single trivial routine from the IDE layer and in doing so creates a mess of dependancies that drag in the entire old IDE layer. Even more sad - it does this for a routine which is usually (little endian) a null function! - Copy the function into ISD200 - Rename it so it doesn't clash with the ide header prototype - Remove all the depend constraints Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c93d46509e7aee7d58680c4c8a12cfbe98df98cb Author: Matthias Kaehlcke Date: Tue Oct 16 19:23:10 2007 +0200 USB: FTDI Elan driver: Convert ftdi->u132_lock to mutex FTDI Elan driver: Convert the semaphore ftdi->u132_lock to the mutex API Signed-off-by: Matthias Kaehlcke Signed-off-by: Greg Kroah-Hartman commit 7898ffc543566a9c4a1b4ff39f43857d2d84a51c Author: Alan Stern Date: Tue Oct 16 11:55:30 2007 -0400 USB: fix scheduling of Iso URBs in uhci-hcd This patch (as1003) changes uhci-hcd to treat the URB_ISO_ASAP flag the same as other host controller drivers, namely, to schedule an Iso URB for the first available time slot that hasn't already expired. URBs in which the flag isn't set will be scheduled for the first slot following the last URB, even if it has expired. This fixes a problem reported by Martin Bachem. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6ce073bd8be0a741440944fed892a136a1d24bbe Author: Alan Cox Date: Thu Oct 18 01:24:25 2007 -0700 USB: io_edgeport: cleanups, and tty speed reporting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bd5e47ccb656e74a775c002d0308c666bea65a2b Author: Andrew Morton Date: Thu Oct 18 01:24:25 2007 -0700 USB: ftd_sio cleanups and updates for new termios work checkpatch fixes WARNING: line over 80 characters #23: FILE: drivers/usb/serial/ftdi_sio.c:297: + speed_t force_baud; /* if non-zero, force the baud rate to this value */ ERROR: use tabs not spaces #31: FILE: drivers/usb/serial/ftdi_sio.c:881: +^I$ ERROR: use tabs not spaces #39: FILE: drivers/usb/serial/ftdi_sio.c:890: +^I$ WARNING: line over 80 characters #111: FILE: drivers/usb/serial/ftdi_sio.c:1956: + tty_encode_baud_rate(port->tty, priv->force_baud, priv->force_baud); Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 669a6db1037efeb064dd6620f69384f99fb45584 Author: Alan Cox Date: Thu Oct 18 01:24:24 2007 -0700 USB: ftd_sio: cleanups and updates for new termios work - Remove can't happen tests - Rework speed validation in terms of baud rates not CBAUD bits - Report speed set (or chosen) - Minor termios correctness Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9ab0f202e6a700d1362a1eb990ac3054f2cd15ea Author: Alan Cox Date: Thu Oct 18 01:24:24 2007 -0700 USB: cp2101: convert to new termios - Convert to new baud rate functions - Add baud rate reporting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 01d1df29517625b8e8b5f48a0d3c2020d950eb4b Author: Alan Cox Date: Thu Oct 18 01:24:23 2007 -0700 USB: whiteheat: clean up can't happen checks and encode baud rate Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 337850917a690ca83605b30b29c464bb3397abdf Author: Alan Cox Date: Thu Oct 18 01:24:22 2007 -0700 usb-serial: handle NULL termios methods as "no hardware changing support" Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ed1f12ec50224222be9cc494cb72b4322bbacd7f Author: Alan Cox Date: Thu Oct 18 01:24:22 2007 -0700 USB: sierra: termios No hardware termios setting in this case so keep the old settings Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e650d8ae0494bb937eea6c7fd1a60e57ba74cd53 Author: Alan Cox Date: Thu Oct 18 01:24:21 2007 -0700 USB: option: termios handling For the devices that have no hardware settings set up the termios return properly. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a6ebf80dbc186d4782d6b08cf3676e4f22a8a84b Author: Alan Cox Date: Thu Oct 18 01:24:21 2007 -0700 USB: kobil_sct: termios encoding fixups - Clear unsupported CMSPAR - Encode resulting speeds Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 74240b07a908e09e18fa09f2cba44f212be9c4c3 Author: Alan Cox Date: Thu Oct 18 01:24:20 2007 -0700 USB: keyspan termios tidy - Clear unsupported CMSPAR bit - Clean up long chains of a->b-> a bit - Encode baud rate back into tty structure properly Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 560aac22e1dce7c7e9756a0a4450ca3bae58fcd5 Author: Alan Cox Date: Thu Oct 18 01:24:20 2007 -0700 USB: ir_usb: termios handling - Clean up paranoia checks - Propogate back a correct fixed termios Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 998e8638711680aecceb9c2ea3b8a09a120d605b Author: Alan Cox Date: Thu Oct 18 01:24:19 2007 -0700 USB: empeg: clean up and handle speeds The empeg is pretty fixed. Tidy up the long foo->bar->baz stuff and encode the fixed speed properly. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7fa36a994cb4298f29994a248ced831be8dc7051 Author: Alan Cox Date: Thu Oct 18 01:24:19 2007 -0700 USB: digi_acceleport: fix termios and also readability a bit - Expand some x&y to x & y so I could read it when checking - Clear CMSPAR bit in the termios (as the driver does not support it) - Encode the speed using the new tty_encode_baud_rate facility Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 73f593081911b1be0d8d3962ecedd635c1e27179 Author: Alan Cox Date: Thu Oct 18 01:24:18 2007 -0700 USB: ch341: fix termios handling The ch341 currently doesn't support most of the hardware setting. So to keep the termios data right we propogate the old termios hardware values back then encode the speed. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7cc7ee28263e89793ae4d21e6e0102404c9a037b Author: Alan Cox Date: Thu Oct 18 01:24:18 2007 -0700 usb serial: kill another case we pass NULL and shouldn't Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit adb5dca17dde297b685d57ec68fa0e5490feee8b Author: Alan Cox Date: Thu Oct 18 01:24:17 2007 -0700 USB: ark3116: update termios handling - Set the i/ospeed in the initial termios properly - Use the tty_encode_baud_rate functions to report resulting rates properly Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 149b36eae2ab6aa6056664f4bc461f3d3affc9c1 Author: Alan Cox Date: Thu Oct 18 01:24:16 2007 -0700 serial: stop passing NULL to functions that expect data Earlier patches have removed the checking for old v new differences from the USB drivers so we can now pass in a valid blank old termios so that we don't to fill the drivers with magic hacks for console support Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3657f6c018907870d4264d466def384b58608484 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 USB: add new Novatel device ids to option driver This adds support for the U727 and MC950 devices. Cc: Rony Sarkis Signed-off-by: Greg Kroah-Hartman commit 85cdffcde0b6b831a06422413300d0f5c0e608c3 Author: Hugh Dickins Date: Thu Oct 25 09:55:05 2007 +0200 fix sg_phys to use dma_addr_t x86_32 CONFIG_HIGHMEM64G with 5GB RAM hung when booting, after issuing some "request_module: runaway loop modprobe binfmt-0000" messages in trying to exec /sbin/init. The binprm buf doesn't see the right ".ELF" header because sg_phys() is providing the wrong physical addresses for high pages: a 32-bit unsigned long is too small in this case, we need to use dma_addr_t. Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe commit 96fd4cd3e40e240f0c385af87f58e74da8b7099a Author: Ayaz Abdulla Date: Thu Oct 25 03:36:42 2007 -0400 [netdrvr] forcedeth: add MCP77 device IDs Signed-off-by: Jeff Garzik commit 500d2c2f7b8c1cf6194dc9e8f47c6e2295fc5be5 Author: Thomas Sailer Date: Wed Oct 24 00:47:19 2007 +0200 rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size This patch makes the host RNDIS driver talk to RNDIS devices with an MTU less than 1.5k, instead of refusing to talk to such a device. Signed-Off-by: Thomas Sailer Acked-by: David Brownell -- Hi Jeff, are you the right person to send this to? Nobody else seems to be wanting to forward this to Linus... Thanks, Tom Signed-off-by: Jeff Garzik commit b88219f8a2028a1ca2dd17aa7c9d9b643615646e Author: Eugene Konev Date: Wed Oct 24 10:42:03 2007 +0800 cpmac: update to new fixed phy driver interface Use fixed_mdio_get_phydev for obtaining fixed phy instances and adopt to changed fixed phy device naming. Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit 67d129d14da1555bb3eaca754f6f81c02cacbe0e Author: Eugene Konev Date: Wed Oct 24 10:42:02 2007 +0800 cpmac: convert to napi_struct interface Convert cpmac to new napi_struct API introduced by bea3348eef27e6044b6161fd04c3152215f96411 [NET]: Make NAPI polling independent of struct net_device objects. Only disable rx interrupts if napi actually has been scheduled. Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit df523b5cd9950485350fb1b7d97d5b8882d94a4e Author: Eugene Konev Date: Wed Oct 24 10:42:01 2007 +0800 cpmac: use print_mac() instead of MAC_FMT Switch to using DECLARE_MAC_BUF/print_mac() added by commit 0795af5729b18218767fab27c44b1384f72dc9ad [NET]: Introduce and use print_mac() and DECLARE_MAC_BUF(). Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit bbbab5ca835fb7676434815a47add8f2c696bec7 Author: Ingo Molnar Date: Wed Oct 24 13:58:57 2007 +0200 natsemi: fix oops, link back netdevice from private-struct * Andrew Nelless wrote: > Hi, > > I booted up 2.6.24-rc1 this morning [Real early over a brew ;-)] and > was having a problems with multiple ~5 second hangs on SATA/drive init > (Something to do with "EH" something-or-other and resets but I'll > email in separately about it later unless its fixed by the time I get > the chance). > > Anyway, I went to fire up netconsole to get a decent log dump and hit > across the following nasty. Netconsole works fine in 2.6.23.1 with a > similar config and the same kernel parameters. > > A shot of the screen is the only method I could come up with to > capture the log, I hope that is OK, it is pretty readable. > > > The nasty: > http://andotnet.nfshost.com/linux/2.6.24-rc1-netconsole-nullderef.jpg the NULL dereference is here: (gdb) list *0xffffffff804a9504 0xffffffff804a9504 is in natsemi_poll (drivers/net/natsemi.c:717). 712 return count; 713 } 714 715 static inline void __iomem *ns_ioaddr(struct net_device *dev) 716 { 717 return (void __iomem *) dev->base_addr; 718 } 719 which is this code from natsemi.c: 2227 struct net_device *dev = np->dev; 2228 void __iomem * ioaddr = ns_ioaddr(dev); 2229 int work_done = 0; seems like the NAPI changes in -rc1 added an np->dev field but forgot to initialize it ... does the patch below fix the oops for you? Ingo --------------------> Subject: natsemi: fix oops, link back netdevice from private-struct From: Ingo Molnar this commit: commit bea3348eef27e6044b6161fd04c3152215f96411 Author: Stephen Hemminger Date: Wed Oct 3 16:41:36 2007 -0700 [NET]: Make NAPI polling independent of struct net_device objects. added np->dev to drivers/net/natsemi.c's struct netdev_private, but forgot to initialize that new field upon driver init. The result was a predictable NULL dereference oops the first time the hardware generated an interrupt. Reported-by: Andrew Nelless Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 0173b793ca477aa2ca516ebf0a35e137b678d466 Author: Jan-Bernd Themann Date: Wed Oct 24 11:53:34 2007 +0200 ehea: fix port_napi_disable/enable napi_disable / napi_enable must be applied on all ehea queues. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit a40745f5ef38f4542d120bd67c2c4a07702eb1da Author: Adrian Bunk Date: Wed Oct 24 18:27:43 2007 +0200 bonding/bond_main.c: fix cut'n'paste error This patch fixes a cut'n'paste error in commit 1b76b31693d4a6088dec104ff6a6ead54081a3c2. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit c50b85d0fbca0a2017b8c0b1e2aeb650724c0a71 Author: Adrian Bunk Date: Wed Oct 24 18:23:17 2007 +0200 make bonding/bond_main.c:bond_deinit() static bond_deinit() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 96fd74b2d9b59edeed7ea1287d322b7661d549ca Author: Adrian Bunk Date: Wed Oct 24 18:23:19 2007 +0200 drivers/net/ipg.c: cleanups This patch contains the following cleanups: - make ipg_nic_get_stats() static - move DefaultPhyParam[] from ipg.h to ipg.c and make it static Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 4316b450e811a7298c80bb4f905af2de5cab54a8 Author: Adrian Bunk Date: Wed Oct 24 18:25:03 2007 +0200 remove Documentation/networking/net-modules.txt According to git, the only one who touched this file during the last 5 years was me when removing drivers... modinfo offers less ancient information. Signed-off-by: Adrian Bunk Acked-by: Geert Uytterhoeven Acked-by: Paul Gortmaker Signed-off-by: Jeff Garzik commit 4f33a9d9a416313f0ecf6e6953d205385a431cd5 Author: FUJITA Tomonori Date: Thu Oct 25 09:17:03 2007 +0200 ub: add sg_init_table for sense and read capacity commands Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit e88a39dee10d3a506ed8c4ba78cde0dd76a6fc83 Author: FUJITA Tomonori Date: Thu Oct 25 09:13:32 2007 +0200 x86: pci-gart fix map_sg could copy the last sg element to another position (if merging some elements). It breaks sg chaining. This copies only dma_address/length instead of the whole sg element. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit e2e031eb09760c36099ac127eeb175e06d257aef Author: Kuan Luo Date: Thu Oct 25 02:14:17 2007 -0400 [libata] sata_nv: SWNCQ should not apply to MCP61 The mcp61 has bug with ncq. Signed-off-by: Kuan Luo Signed-off-by: Jeff Garzik commit 3acaf94bb0a69cca75a524a4ba8c30a9eae97dc8 Author: Alan Cox Date: Mon Oct 15 19:18:27 2007 +0100 libata-core: Be a bit more relaxed about early DMA zero devices I guess Windows didn't care about the command so neither did they Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit edc93052844c2032b2ec5910ace516da9078714d Author: Tejun Heo Date: Thu Oct 25 14:59:16 2007 +0900 ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2 P5W-DH Deluxe has ICH9 which doesn't have PMP support but SIMG 4726 hardwired to the second port of AHCI controller at PCI device 1f.2. The 4726 doesn't work as PMP but as a storage processor which can do hardware RAID on downstream ports. When no device is attached to the downstream port of the 4726, pseudo ATA device for configuration appears. Unfortunately, ATA emulation on the device is very lousy and causes long hang during boot. This patch implements workaround for the board. If the mainboard is P5W-DH Deluxe (matched using DMI), only hardreset is used on the second port of AHCI controller @ 1f.2 and the hardreset doesn't depend on receiving the first FIS and just proceed to IDENTIFY. This workaround fixes bugzilla #8923. http://bugzilla.kernel.org/show_bug.cgi?id=8923 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c15fcafe1c42daff212d78d4ce9619a52a74379f Author: Al Viro Date: Sun Oct 14 01:12:39 2007 +0100 Fix pata_icside build for recent libata API changes Signed-off-by: Jeff Garzik commit 0e06d9ce7a49d2ef2858cf07b44a324fc3a4c192 Author: Tejun Heo Date: Wed Oct 24 15:21:26 2007 +0900 libata: cosmetic clean up in ata_eh_reset() Local variable @action usage in ata_eh_reset() is a bit confusing. It's used only to cache ehc->i.action to test reset masks after clearing it; however, due to the generic name "action", it's easy to misinterpret the local variable as containing the selected reset method later. Also, the reason for caching the original value is easy to miss. This patch renames @action to @tmp_action and make it buffer newly selected value instead to improve readability. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 741b776335c3e91b0b8bf765a97f9484a3cd5034 Author: Adrian Bunk Date: Wed Oct 24 18:23:06 2007 +0200 libata-core.c: make 2 functions static strn_pattern_cmp() and ata_port_detach() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit e1e72965ec2c02db99b415cd06c17ea90767e3a4 Author: Rusty Russell Date: Thu Oct 25 15:02:50 2007 +1000 lguest: documentation update Went through the documentation doing typo and content fixes. This patch contains only comment and whitespace changes. Signed-off-by: Rusty Russell commit 218f3d30e60f32394738372c594d063f8e43ee6d Author: Jeff Garzik Date: Thu Oct 25 00:33:27 2007 -0400 [libata] Create internal helper ata_dev_set_feature() Signed-off-by: Jeff Garzik commit 568a17ffce2eeceae0cd9fc37e97cbad12f70278 Author: Rusty Russell Date: Thu Oct 25 14:12:24 2007 +1000 lguest: Add to maintainers file. Signed-off-by: Rusty Russell commit 4cfe6c3c1c301d3d7a36c9d579597b75ebb8ea13 Author: Jeff Garzik Date: Thu Oct 25 14:15:09 2007 +1000 lguest: build fix Fix this error (i386 !SMP build) arch/x86/lguest/boot.c: In function ‘lguest_init’: arch/x86/lguest/boot.c:1059: error: ‘pm_power_off’ undeclared (first use in this function) by including linux/pm.h. Signed-off-by: Jeff Garzik Signed-off-by: Rusty Russell commit 7334492b53706964eb055ed8e25e2e3315d7222a Author: Rusty Russell Date: Thu Oct 25 14:12:20 2007 +1000 lguest: clean up lguest_launcher.h Remove now-unused defines. Fix old idempotent #ifndef _ASM_LGUEST_USER name. Fix comment on use of lguest_req. Signed-off-by: Rusty Russell commit 197bff630ae586252d24b3595c54f8f9b712610a Author: Rusty Russell Date: Thu Oct 25 14:10:30 2007 +1000 lguest: remove unused "wake" element from struct lguest Signed-off-by: Rusty Russell commit 25c47bb35355c1e1b2ae325b49441b2c8b201ece Author: Rusty Russell Date: Thu Oct 25 14:09:53 2007 +1000 lguest: use defines from x86 headers instead of magic numbers Signed-off-by: Rusty Russell commit db24e8c2ef7eceb46818a8c22fc38dea733fe159 Author: Rusty Russell Date: Thu Oct 25 14:09:25 2007 +1000 lguest: example launcher header cleanup. Now the kernel headers are clean for userspace export, we don't need to typedef kernel types before including them. We also don't need pci_ids.h (that was from an earlier virtio draft). Signed-off-by: Rusty Russell commit 8ef93cf11413e3f2dc28bfaf736e1f49981ed700 Author: Ingo Molnar Date: Wed Oct 24 18:23:51 2007 +0200 sched: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL. All bugs have been fixed and it's perfect ;-) Signed-off-by: Ingo Molnar commit 681f3e68541d6f03e3e05d21fe15093578b8b539 Author: Peter Williams Date: Wed Oct 24 18:23:51 2007 +0200 sched: isolate SMP balancing code a bit more At the moment, a lot of load balancing code that is irrelevant to non SMP systems gets included during non SMP builds. This patch addresses this issue and reduces the binary size on non SMP systems: text data bss dec hex filename 10983 28 1192 12203 2fab sched.o.before 10739 28 1192 11959 2eb7 sched.o.after Signed-off-by: Peter Williams Signed-off-by: Ingo Molnar commit e1d1484f72127a5580d37c379f6a5b2c2786434c Author: Peter Williams Date: Wed Oct 24 18:23:51 2007 +0200 sched: reduce balance-tasks overhead At the moment, balance_tasks() provides low level functionality for both move_tasks() and move_one_task() (indirectly) via the load_balance() function (in the sched_class interface) which also provides dual functionality. This dual functionality complicates the interfaces and internal mechanisms and makes the run time overhead of operations that are called with two run queue locks held. This patch addresses this issue and reduces the overhead of these operations. Signed-off-by: Peter Williams Signed-off-by: Ingo Molnar commit a0f846aa76c3e03d54c1700a87cab3a46ccd71e2 Author: Adrian Bunk Date: Wed Oct 24 18:23:50 2007 +0200 sched: make cpu_shares_{show,store}() static cpu_shares_{show,store}() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar commit 2b01dfe37203e825edd8417ad3993d01cbbb527e Author: Paul Menage Date: Wed Oct 24 18:23:50 2007 +0200 sched: clean up some control group code - replace "cont" with "cgrp" in a few places in the CFS cgroup code, - use write_uint rather than write for cpu.shares write function Signed-off-by: Paul Menage Acked-by : Srivatsa Vaddagiri Signed-off-by: Ingo Molnar commit a8972ccf00b7184a743eb6cd9bc7f3443357910c Author: Joe Perches Date: Wed Oct 24 18:23:50 2007 +0200 sched: constify sched.h Add const to some struct task_struct * uses Signed-off-by: Joe Perches Signed-off-by: Ingo Molnar commit b3da2a73ff5a2953a4ad8ebbf0aa7e6965ff9de2 Author: Mel Gorman Date: Wed Oct 24 18:23:50 2007 +0200 sched: document profile=sleep requiring CONFIG_SCHEDSTATS profile=sleep only works if CONFIG_SCHEDSTATS is set. This patch notes the limitation in Documentation/kernel-parameters.txt and prints a warning at boot-time if profile=sleep is used without CONFIG_SCHEDSTAT. Signed-off-by: Mel Gorman Signed-off-by: Ingo Molnar commit 838225b48edc971620cbeb292034dabd2b0d7d1d Author: Satyam Sharma Date: Wed Oct 24 18:23:50 2007 +0200 sched: use show_regs() to improve __schedule_bug() output A full register dump along with stack backtrace would make the "scheduling while atomic" message more helpful. Use show_regs() instead of dump_stack() for this. We already know we're atomic in here (that is why this function was called) so show_regs()'s atomicity expectations are guaranteed. Also, modify the output of the "BUG: scheduling while atomic:" header a bit to keep task->comm and task->pid together and preempt_count() after them. Signed-off-by: Satyam Sharma Signed-off-by: Ingo Molnar commit 4dcf6aff023d9934630fb3649284951831c51f8f Author: Ingo Molnar Date: Wed Oct 24 18:23:48 2007 +0200 sched: clean up sched_domain_debug() clean up sched_domain_debug(). this also shrinks the code a bit: text data bss dec hex filename 50474 4306 480 55260 d7dc sched.o.before 50404 4306 480 55190 d796 sched.o.after Signed-off-by: Ingo Molnar commit b15136e9497ef5d6e08cf665e0d0acf7a229f6dc Author: Ingo Molnar Date: Wed Oct 24 18:23:48 2007 +0200 sched: fix fastcall mismatch in completion APIs Jeff Dike noticed that wait_for_completion_interruptible()'s prototype had a mismatched fastcall. Fix this by removing the fastcall attributes from all the completion APIs. Found-by: Jeff Dike Signed-off-by: Ingo Molnar commit 7378547f2c83ca16a30d0a7c488a43a688ea0888 Author: Milton Miller Date: Wed Oct 24 18:23:48 2007 +0200 sched: fix sched_domain sysctl registration again commit 029190c515f15f512ac85de8fc686d4dbd0ae731 (cpuset sched_load_balance flag) was not tested SCHED_DEBUG enabled as committed as it dereferences NULL when used and it reordered the sysctl registration to cause it to never show any domains or their tunables. Fixes: 1) restore arch_init_sched_domains ordering we can't walk the domains before we build them presently we register cpus with empty directories (no domain directories or files). 2) make unregister_sched_domain_sysctl do nothing when already unregistered detach_destroy_domains is now called one set of cpus at a time unregister_syctl dereferences NULL if called with a null. While the the function would always dereference null if called twice, in the previous code it was always called once and then was followed a register. So only the hidden bug of the sysctl_root_table not being allocated followed by an attempt to free it would have shown the error. 3) always call unregister and register in partition_sched_domains The code is "smart" about unregistering only needed domains. Since we aren't guaranteed any calls to unregister, always unregister. Without calling register on the way out we will not have a table or any sysctl tree. 4) warn if register is called without unregistering The previous table memory is lost, leaving pointers to the later freed memory in sysctl and leaking the memory of the tables. Before this patch on a 2-core 4-thread box compiled for SMT and NUMA, the domains appear empty (there are actually 3 levels per cpu). And as soon as two domains a null pointer is dereferenced (unreliable in this case is stack garbage): bu19a:~# ls -R /proc/sys/kernel/sched_domain/ /proc/sys/kernel/sched_domain/: cpu0 cpu1 cpu2 cpu3 /proc/sys/kernel/sched_domain/cpu0: /proc/sys/kernel/sched_domain/cpu1: /proc/sys/kernel/sched_domain/cpu2: /proc/sys/kernel/sched_domain/cpu3: bu19a:~# mkdir /dev/cpuset bu19a:~# mount -tcpuset cpuset /dev/cpuset/ bu19a:~# cd /dev/cpuset/ bu19a:/dev/cpuset# echo 0 > sched_load_balance bu19a:/dev/cpuset# mkdir one bu19a:/dev/cpuset# echo 1 > one/cpus bu19a:/dev/cpuset# echo 0 > one/sched_load_balance Unable to handle kernel paging request for data at address 0x00000018 Faulting instruction address: 0xc00000000006b608 NIP: c00000000006b608 LR: c00000000006b604 CTR: 0000000000000000 REGS: c000000018d973f0 TRAP: 0300 Not tainted (2.6.23-bml) MSR: 9000000000009032 CR: 28242442 XER: 00000000 DAR: 0000000000000018, DSISR: 0000000040000000 TASK = c00000001912e340[1987] 'bash' THREAD: c000000018d94000 CPU: 2 .. NIP [c00000000006b608] .unregister_sysctl_table+0x38/0x110 LR [c00000000006b604] .unregister_sysctl_table+0x34/0x110 Call Trace: [c000000018d97670] [c000000007017270] 0xc000000007017270 (unreliable) [c000000018d97720] [c000000000058710] .detach_destroy_domains+0x30/0xb0 [c000000018d977b0] [c00000000005cf1c] .partition_sched_domains+0x1bc/0x230 [c000000018d97870] [c00000000009fdc4] .rebuild_sched_domains+0xb4/0x4c0 [c000000018d97970] [c0000000000a02e8] .update_flag+0x118/0x170 [c000000018d97a80] [c0000000000a1768] .cpuset_common_file_write+0x568/0x820 [c000000018d97c00] [c00000000009d95c] .cgroup_file_write+0x7c/0x180 [c000000018d97cf0] [c0000000000e76b8] .vfs_write+0xe8/0x1b0 [c000000018d97d90] [c0000000000e810c] .sys_write+0x4c/0x90 [c000000018d97e30] [c00000000000852c] syscall_exit+0x0/0x40 Signed-off-by: Milton Miller Signed-off-by: Ingo Molnar commit 24c667db59a9cc4caaafe4f77f6f4ef85899a454 Author: Gerrit Renker Date: Wed Oct 24 10:53:01 2007 -0200 [CCID2/3]: Initialisation assignments of 0 are redundant Assigning initial values of `0' is redundant when loading a new CCID structure, since in net/dccp/ccid.c the entire CCID structure is zeroed out prior to initialisation in ccid_new(): struct ccid { struct ccid_operations *ccid_ops; char ccid_priv[0]; }; // ... if (rx) { memset(ccid + 1, 0, ccid_ops->ccid_hc_rx_obj_size); if (ccid->ccid_ops->ccid_hc_rx_init != NULL && ccid->ccid_ops->ccid_hc_rx_init(ccid, sk) != 0) goto out_free_ccid; } else { memset(ccid + 1, 0, ccid_ops->ccid_hc_tx_obj_size); /* analogous to the rx case */ } This patch therefore removes the redundant assignments. Thanks to Arnaldo for the inspiration. Signed-off-by: Gerrit Renker Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit 76fd1e87d9456c8185b8df76ac5e533e0c8b39bb Author: Gerrit Renker Date: Wed Oct 24 10:46:58 2007 -0200 [DCCP]: Unaligned pointer access This fixes `unaligned (read) access' errors of the type Kernel unaligned access at TPC[100f970c] dccp_parse_options+0x4f4/0x7e0 [dccp] Kernel unaligned access at TPC[1011f2e4] ccid3_hc_tx_parse_options+0x1ac/0x380 [dccp_ccid3] Kernel unaligned access at TPC[100f9898] dccp_parse_options+0x680/0x880 [dccp] by using the get_unaligned macro for parsing options. Commiter note: Preserved the sparse __be{16,32} annotations. Signed-off-by: Gerrit Renker Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit d8ef2c29a0dcfccb2d90cac990143d1a4668708a Author: Gerrit Renker Date: Wed Oct 24 10:27:48 2007 -0200 [DCCP]: Convert Reset code into socket error number This adds support for converting the 11 currently defined Reset codes into system error numbers, which are stored in sk_err for further interpretation. This makes the externally visible API behaviour similar to TCP, since a client connecting to a non-existing port will experience ECONNREFUSED. * Code 0, Unspecified, is interpreted as non-error (0); * Code 1, Closed (normal termination), also maps into 0; * Code 2, Aborted, maps into "Connection reset by peer" (ECONNRESET); * Code 3, No Connection and Code 7, Connection Refused, map into "Connection refused" (ECONNREFUSED); * Code 4, Packet Error, maps into "No message of desired type" (ENOMSG); * Code 5, Option Error, maps into "Illegal byte sequence" (EILSEQ); * Code 6, Mandatory Error, maps into "Operation not supported on transport endpoint" (EOPNOTSUPP); * Code 8, Bad Service Code, maps into "Invalid request code" (EBADRQC); * Code 9, Too Busy, maps into "Too many users" (EUSERS); * Code 10, Bad Init Cookie, maps into "Invalid request descriptor" (EBADR); * Code 11, Aggression Penalty, maps into "Quota exceeded" (EDQUOT) which makes sense in terms of using more than the `fair share' of bandwidth. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit 1238d0873b29f7a2de75d576b4cc706c1c75ffbf Author: Gerrit Renker Date: Wed Oct 24 10:18:06 2007 -0200 [DCCP]: One more exemption from full sequence number checks This fixes the following problem: client connects to peer which has no DCCP enabled or loaded; ICMP error messages ("Protocol Unavailable") can be seen on the wire, but the application hangs. Reason: ICMP packets don't get through to dccp_v4_err. When reporting errors, a sequence number check is made for the DCCP packet that had caused an ICMP error to arrive. Such checks can not be made if the socket is in state LISTEN, RESPOND (which in the implementation is the same as LISTEN), or REQUEST, since update_gsr() has not been called in these states, hence the sequence window is 0..0. This patch fixes the problem by adding the REQUEST state as another exemption to the window check. The error reporting now works as expected on connecting. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit fde20105f332614b23a3131d706cd90bdd7db72d Author: Gerrit Renker Date: Wed Oct 24 10:12:09 2007 -0200 [DCCP]: Retrieve packet sequence number for error reporting This fixes a problem when analysing erroneous packets in dccp_v{4,6}_err: * dccp_hdr_seq currently takes an skb * however, the transport headers in the skb are shifted, due to the preceding IPv4/v6 header. Fixed for v4 and v6 by changing dccp_hdr_seq to take a struct dccp_hdr as argument. Verified that the correct sequence number is now reported in the error handler. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit 82861924a5f26208c8421a799a4e8724d48eb560 Author: Adrian Bunk Date: Wed Oct 24 14:09:25 2007 +0200 blackfin: fix sg fallout Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 8c7837c4f5cf177729297ba3fef1ec62f50f499b Author: Jens Axboe Date: Wed Oct 24 13:28:40 2007 +0200 xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it It's currently using asm/scatterlist.h, but that is not enough. Signed-off-by: Jens Axboe commit 5d9dc2cfd881b3b93c3f819ee94ad3ab7184b29a Merge: 3d1266c... 18ccc41... Author: Jens Axboe Date: Wed Oct 24 13:25:26 2007 +0200 Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 into sg commit 3d1266c7042e696704e22085a0f55c714bc06194 Author: Jens Axboe Date: Wed Oct 24 13:21:21 2007 +0200 SG: audit of drivers that use blk_rq_map_sg() They need to properly init the sg table, or blk_rq_map_sg() will complain if CONFIG_DEBUG_SG is set. Signed-off-by: Jens Axboe commit 23464ffa47689e46985fb10ae9e34bbc9e83f387 Author: WANG Cong Date: Wed Oct 24 13:07:11 2007 +0200 arch/um/drivers/ubd_kern.c: fix a building error Fix this uml building error: arch/um/drivers/ubd_kern.c: In function 'do_ubd_request': arch/um/drivers/ubd_kern.c:1118: error: implicit declaration of function 'sg_page' arch/um/drivers/ubd_kern.c:1118: warning: passing argument 6 of 'prepare_request' makes pointer from integer without a cast make[1]: *** [arch/um/drivers/ubd_kern.o] Error 1 make: *** [arch/um/drivers] Error 2 Signed-off-by: WANG Cong Add sg_init_table() call as well. Signed-off-by: Jens Axboe commit eec407c9ac5ee819bfcadb4e39ce892576d570d1 Author: Alexey Dobriyan Date: Wed Oct 24 12:58:02 2007 +0200 x86: fix bogus KERN_ALERT on oops fix this: printing eip: f881b9f3 *pdpt = 0000000000003001 <1>*pde = 000000000480a067 *pte = 0000000000000000 ^^^ [ mingo: added KERN_CONT as suggested by Pekka Enberg ] Signed-off-by: Alexey Dobriyan Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 230e55adf6f74309683a068dec23e664a64fb08a Author: Jeff Garzik Date: Wed Oct 24 12:58:02 2007 +0200 x86: lguest build fix Fix this error (i386 !SMP build): arch/x86/lguest/boot.c: In function lguest_init: arch/x86/lguest/boot.c:1059: error: pm_power_off undeclared (first use in this function) by including linux/pm.h. Signed-off-by: Jeff Garzik Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 1fb473d8f45658532555b956ee24e25a0ba493cd Author: Mike Galbraith Date: Wed Oct 24 12:58:01 2007 +0200 x86: fix CONFIG_KEXEC build breakage X86_32 build fix to commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f Signed-off-by: Mike Galbraith Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 642f149031d70415d9318b919d50b71e4724adbd Author: Jens Axboe Date: Wed Oct 24 11:20:47 2007 +0200 SG: Change sg_set_page() to take length and offset argument Most drivers need to set length and offset as well, so may as well fold those three lines into one. Add sg_assign_page() for those two locations that only needed to set the page, where the offset/length is set outside of the function context. Signed-off-by: Jens Axboe commit 9317d4313e0cd51b2256ea9a9316f2d8561e37a8 Author: Jeff Garzik Date: Tue Oct 23 18:36:39 2007 -0400 ISDN/sc: fix longstanding warning drivers/isdn/sc/shmem.c: In function 'memcpy_toshmem': drivers/isdn/sc/shmem.c:54: warning: passing argument 1 of 'memcpy_toio' makes pointer from integer without a cast Also, remove some unneeded braces, and add some useful whitespace. Signed-off-by: Jeff Garzik commit 18ccc4194389c6edc78ede76ada3bf753525b11c Author: Haavard Skinnemoen Date: Wed Oct 24 10:16:02 2007 +0200 AVR32: Fix sg_page breakage The latest sg changes introduce the following build errors on AVR32: include/asm/dma-mapping.h: In function ‘dma_map_sg’: include/asm/dma-mapping.h:220: error: implicit declaration of function ‘sg_page’ include/asm/dma-mapping.h:220: error: invalid operands to binary - include/asm/dma-mapping.h:221: error: implicit declaration of function ‘sg_virt’ include/asm/dma-mapping.h:221: warning: assignment makes pointer from integer without a cast include/asm/dma-mapping.h: In function ‘dma_sync_sg_for_device’: include/asm/dma-mapping.h:330: warning: passing argument 2 of ‘dma_cache_sync’ makes pointer from integer without a cast Fix it by including the correct header file, i.e. linux/scatterlist.h instead of asm/scatterlist.h. Signed-off-by: Haavard Skinnemoen commit bd6dee6f30a0f6943df190b387b5f8fe98a848f3 Author: Jens Axboe Date: Wed Oct 24 09:01:09 2007 +0200 mmc: sg fallout Do a full scan of the directory to try and be a bit more proactive, instead of waiting for things to break. Signed-off-by: Jens Axboe commit 5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339 Author: Geert Uytterhoeven Date: Wed Oct 24 08:55:40 2007 +0200 m68k: sg fallout Signed-off-by: Geert Uytterhoeven Signed-off-by: Jens Axboe commit d91c5e8839791b27672277e81451873499bc517e Author: David Miller Date: Wed Oct 24 08:46:01 2007 +0200 More SG build fixes Signed-off-by: Jens Axboe commit de58d942924d431c1c2144ece35b0b9aceadaf2c Author: Heiko Carstens Date: Wed Oct 24 08:45:35 2007 +0200 sg: add missing sg_init_table calls to zfcp kernel BUG at include/linux/scatterlist.h:50! illegal operation: 0001 [#1] [...] Call Trace: ([<000000000026f184>] zfcp_ns_gid_pn_request+0x4c/0x2a0) [<0000000000276dd4>] zfcp_erp_strategy_do_action+0x1410/0x1938 [<0000000000278412>] zfcp_erp_thread+0x4fa/0x1430 [<000000000001990a>] kernel_thread_starter+0x6/0xc [<0000000000019904>] kernel_thread_starter+0x0/0xc Cc: Swen Schillig Cc: Christof Schmitt Signed-off-by: Heiko Carstens Signed-off-by: Jens Axboe commit 5e2a06489e4d4d85ca4ca20af23f213e95c2fbeb Author: David Miller Date: Wed Oct 24 08:44:21 2007 +0200 SG build fix Signed-off-by: David S. Miller Signed-off-by: Jens Axboe commit d58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1 Author: Chris Wright Date: Tue Oct 23 20:36:14 2007 -0700 [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED) Looks like the MAP_FIXED case is using the wrong address hint. I'd expect the comment "don't mess with it" means pass the request straight on through, not change the address requested to -ENOMEM. Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit 03cf786c4e83dba404ad23ca58f49147ae52dffd Author: Pavel Emelyanov Date: Tue Oct 23 21:17:27 2007 -0700 [IPV4]: Explicitly call fib_get_table() in fib_frontend.c In case the "multiple tables" config option is y, the ip_fib_local_table is not a variable, but a macro, that calls fib_get_table(RT_TABLE_LOCAL). Some code uses this "variable" *3* times in one place, thus implicitly making 3 calls. Fix it. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit f0fe91ded36bab95541e960ae8a115abc1f5ba03 Author: Pavel Emelyanov Date: Tue Oct 23 21:15:21 2007 -0700 [NET]: Use BUILD_BUG_ON in net/core/flowi.c Instead of ugly extern not-existing function. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 342709efc7a4ba91eac6d2d2d931ec316a587dfa Author: Pavel Emelyanov Date: Tue Oct 23 21:14:45 2007 -0700 [NET]: Remove in-code externs for some functions from net/core/dev.c Inconsistent prototype and real type for functions may have worse consequences, than those for variables, so move them into a header. Since they are used privately in net/core, make this file reside in the same place. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a37ae4086e7e804db534bc8f2d31c2fbf89c5761 Author: Pavel Emelyanov Date: Tue Oct 23 21:13:53 2007 -0700 [NET]: Don't declare extern variables in net/core/sysctl_net_core.c Some are already declared in include/linux/netdevice.h, while some others (xfrm ones) need to be declared. The driver/net/rrunner.c just uses same extern as well, so cleanup it also. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit c1bd24b76879f61b2d10609b0dabde400792a6ec Author: Chuck Lever Date: Tue Oct 23 21:08:54 2007 -0700 [TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update() The tcp_minshall_update() function is called in exactly one place, and is passed an unsigned integer for the mss_len argument. Make the sign of the argument match the sign of the passed variable in order to eliminate an unneeded implicit type cast and a mixed sign comparison in tcp_minshall_update(). Signed-off-by: Chuck Lever Signed-off-by: David S. Miller commit c2636b4d9e8ab8d16b9e2bf0f0744bb8418d4026 Author: Chuck Lever Date: Tue Oct 23 21:07:32 2007 -0700 [NET]: Treat the sign of the result of skb_headroom() consistently In some places, the result of skb_headroom() is compared to an unsigned integer, and in others, the result is compared to a signed integer. Make the comparisons consistent and correct. Signed-off-by: Chuck Lever Signed-off-by: David S. Miller commit 0ffdd581497286e8af529b0b39770c01eab15b30 Author: Roel Kluin <12o3l@tiscali.nl> Date: Tue Oct 23 20:52:48 2007 -0700 [9P]: Fix missing unlock before return in p9_mux_poll_start Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: David S. Miller commit 0034622693ad21d6b341a1b51e766f72d1ef512e Author: Pavel Emelyanov Date: Tue Oct 23 20:50:58 2007 -0700 [PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE Fix one more user of netiff_subqueue_stopped. To check for the queue id one must use the __netiff_subqueue_stoped call. This run out of my sight when I made the: 668f895a85b0c3a62a690425145f13dabebebd7a [NET]: Hide the queue_mapping field inside netif_subqueue_stopped commit :( Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 6a5f44d7a048c97b8bae8ce464c97b8fad61ff99 Author: Timo Teras Date: Tue Oct 23 20:31:53 2007 -0700 [IPV4] ip_gre: sendto/recvfrom NBMA address When GRE tunnel is in NBMA mode, this patch allows an application to use a PF_PACKET socket to: - send a packet to specific NBMA address with sendto() - use recvfrom() to receive packet and check which NBMA address it came from This is required to implement properly NHRP over GRE tunnel. Signed-off-by: Timo Teras Acked-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 16d14ef9f29dfa9b1d99f3eff860e9f15bc99f39 Author: Pavel Emelyanov Date: Tue Oct 23 20:30:25 2007 -0700 [SCTP]: Consolidate sctp_ulpq_renege_xxx functions Both are equal, except for the list to be traversed. Signed-off-by: Pavel Emelyanov Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit 5c58298c2536252ab95aa2b1497ab47eb878ca5d Author: Denis V. Lunev Date: Tue Oct 23 20:29:25 2007 -0700 [NETLINK]: Fix ACK processing after netlink_dump_start Revert to original netlink behavior. Do not reply with ACK if the netlink dump has bees successfully started. libnl has been broken by the cd40b7d3983c708aabe3d3008ec64ffce56d33b0 The following command reproduce the problem: /nl-route-get 192.168.1.1 Signed-off-by: Denis V. Lunev Acked-by: Thomas Graf Signed-off-by: David S. Miller commit be7f827360b5dfecd8f43adbd48f2c39556004c9 Author: Patrick McHardy Date: Tue Oct 23 20:26:36 2007 -0700 [VLAN]: MAINTAINERS update Ben stepped down from VLAN maintainership due to a lack of time, add myself as new maintainer. Signed-off-by: Patrick McHardy Acked-by: Ben Greear Signed-off-by: David S. Miller commit 6273172e1772bf5ce8697bcae145f0f2954fd159 Author: Arnaldo Carvalho de Melo Date: Tue Oct 23 20:23:30 2007 -0700 [DCCP]: Implement SIOCINQ/FIONREAD Just like UDP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Leandro Melo de Sales Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit bada339ba24dee9e143bfb42e1dc61f146619846 Author: Jeff Garzik Date: Tue Oct 23 20:19:37 2007 -0700 [NET]: Validate device addr prior to interface-up Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller