commit d395991c117d43bfca97101a931a41d062a93852 Merge: b73384f... b445c56... Author: Linus Torvalds Date: Fri Feb 29 16:54:33 2008 -0800 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] wrap kmap_atomic(KM_IRQ0) with local_irq_save/restore() sata_svw: Add support for HT1100 SATA controller commit b445c56815d84b9fce40707f99811bdc354458e0 Author: Jeff Garzik Date: Fri Feb 29 19:10:51 2008 -0500 [libata] wrap kmap_atomic(KM_IRQ0) with local_irq_save/restore() Interrupts must be disabled if using kmap_atomic(KM_IRQ0), but that was not the case in a few code paths coming directly from ATA driver interrupt handlers (which use spin_lock rather than spin_lock_irqsave). Signed-off-by: Jeff Garzik commit b73384f06159d8388d7d17913b7e3a07e234c1ab Merge: c9e7100... d862ccc... Author: Linus Torvalds Date: Fri Feb 29 15:18:44 2008 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4843/1: Add GCR_CLKBPB for PXA3xx [ARM] 4842/1: pxa: remove redundant IRQ saving/restoring in clk_pxa3xx_cken_* [ARM] 4841/1: pxa: fix typo in LCD platform data definition code for zylonite [ARM] 4840/1: pxa: fix the typo in get_irqnr_and_base [ARM] 4839/1: fixes kernel Oops in /dev/mem device driver for memory map with PHYS_OFF [ARM] eliminate MODULE_PARM() usage [ARM] 4838/1: Fix kexec for SA1100 machines [ARM] 4837/1: make __get_unaligned_*() return unsigned types [ARM] 4836/1: Make ATAGS_PROC depend on KEXEC commit d862ccc570c875e1454fc57ed00f5a1081985b26 Author: Mark Brown Date: Wed Feb 27 15:34:56 2008 +0100 [ARM] 4843/1: Add GCR_CLKBPB for PXA3xx The PXA3xx AC97 controller has an additional control bit GCR_CLKBPB which must be used during cold reset. Signed-off-by: Mark Brown Acked-by: eric miao Signed-off-by: Russell King commit ceee4f98f73bb7a1f6ee6710b9ebffd0ecb8c0ca Author: eric miao Date: Wed Feb 27 02:01:11 2008 +0100 [ARM] 4842/1: pxa: remove redundant IRQ saving/restoring in clk_pxa3xx_cken_* This is unnecessary since it is already protected by spin_lock_irq{save, restore} in clock.c. Signed-off-by: eric miao Signed-off-by: Russell King commit 7a987e82cd9175215dec6339d383d64e551c8899 Author: eric miao Date: Wed Feb 27 02:00:26 2008 +0100 [ARM] 4841/1: pxa: fix typo in LCD platform data definition code for zylonite Signed-off-by: eric miao Signed-off-by: Russell King commit a3359e21c06cb5b366fb47307b3d2fd23386a774 Author: eric miao Date: Wed Feb 27 01:59:28 2008 +0100 [ARM] 4840/1: pxa: fix the typo in get_irqnr_and_base This typo causes the incorrect calculation of the IRQ numbers in the ICIP2 registers. Signed-off-by: eric miao Signed-off-by: Russell King commit 9ae3ae0bebb9a3a348dc233229008b126014889d Author: Alexandre Rusev Date: Tue Feb 26 18:42:10 2008 +0100 [ARM] 4839/1: fixes kernel Oops in /dev/mem device driver for memory map with PHYS_OFF "cat /dev/mem" may cause kernel Oops for boards with PHYS_OFFSET != 0 because character device is mapped to addresses starting from zero and there is no protection against such situation. Patch just add this. Signed-off-by: Alexandre Rusev Signed-off-by: Russell King commit c710e39cbec4f3d60acd07f5356404a61bc1959a Author: Randy Dunlap Date: Wed Feb 27 12:11:16 2008 -0800 [ARM] eliminate MODULE_PARM() usage Convert debug-only (and removed) MODULE_PARM() to module_param(). Compiles cleanly (with DEBUG=1). Signed-off-by: Randy Dunlap Signed-off-by: Russell King commit 5ce94e9e8b469a17fbd3efa1b940c19b5e43449a Author: Thomas Kunze Date: Sun Feb 24 17:59:34 2008 +0100 [ARM] 4838/1: Fix kexec for SA1100 machines This patch sets KEXEC_CONTROL_MEMORY_LIMIT to (-1)UL. As the value is compared with physical addresses TASK_SIZE makes no sense. Machines where the RAM addresses start above TASK_SIZE kexecs eats all memory and crashes the kernel without this patch. Signed-off-by: Thomas Kunze Acked-by: Richard Purdie Signed-off-by: Russell King commit 94a3f78566ef98a48814d82892f28bb741624cb8 Author: Lennert Buytenhek Date: Sat Feb 23 00:23:48 2008 +0100 [ARM] 4837/1: make __get_unaligned_*() return unsigned types Eric Sandeen tracked an XFS on ARM corruption bug down to a function under fs/xfs/ involving some get_unaligned() calls on u64 pointers. As it turns out, calling ARM's get_unaligned() on a u64 pointer pointing to the following byte sequence: 80 81 82 83 84 85 86 87 would return ffffffff83828180 (LE mode.) This turns out to be because of implicit u8 -> int promotion in ARM's implementation of various helpers for get_unaligned(), causing them to accidentally return signed instead of unsigned values, which in turn caused the subsequent casts to unsigned long long in __get_unaligned_8_[bl]e() to sign-extend the lower words. Fix by casting the return values of __get_unaligned_[24]_[bl]e() to unsigned int. Cc: Eric Sandeen Cc: Rabeeh Khoury Cc: Nicolas Pitre Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit b98d7291883f7ed27e3f4b59bc12dc963c9f72a6 Author: Uli Luckas Date: Fri Feb 22 16:45:18 2008 +0100 [ARM] 4836/1: Make ATAGS_PROC depend on KEXEC On Wed, Feb 20, 2008 at 11:50:33AM +0100, Guennadi Liakhovetski wrote: > arch/arm/kernel/atags.c uses for some reason the > KEXEC_BOOT_PARAMS_SIZE macro, which is only defined if CONFIG_KEXEC > is set. So, either this macro should be defined always, or another > macro should be used, or ATAGS_PROC should depend on KEXEC. As the procfs export of ATAGS is not meant as a stable, general purpose ABI it shouldn't be an independent, general configuration option. This patch make ATAGS_PROC depend on KEXEC Signed-off-by: Uli Luckas Signed-off-by: Russell King commit c9e71002aacc9821e99531dcc130db88bbc8ad05 Author: Paul E. McKenney Date: Thu Feb 28 11:51:07 2008 -0800 rcupreempt: remove never-migrates assumption from rcu_process_callbacks() This patch fixes a potentially invalid access to a per-CPU variable in rcu_process_callbacks(). This per-CPU access needs to be done in such a way as to guarantee that the code using it cannot move to some other CPU before all uses of the value accessed have completed. Even though this code is currently only invoked from softirq context, which currrently cannot migrate to some other CPU, life would be better if this code did not silently make such an assumption. Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit ae778869ae4549628b9e83efe958c3aaa63ed1b9 Author: Paul E. McKenney Date: Wed Feb 27 16:21:10 2008 -0800 rcupreempt: fix hibernate/resume in presence of PREEMPT_RCU and hotplug This fixes a oops encountered when doing hibernate/resume in presence of PREEMPT_RCU. The problem was that the code failed to disable preemption when accessing a per-CPU variable. This is OK when called from code that already has preemption disabled, but such is not the case from the suspend/resume code path. Reported-by: Dave Young Tested-by: Dave Young Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit 076d84bbdb396360d16aaa108c55aa1e24ad47a3 Merge: d40e705... 7be2a03... Author: Linus Torvalds Date: Fri Feb 29 10:19:27 2008 -0800 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: softlockup: fix task state setting rcu: add support for dynamic ticks and preempt rcu commit d40e705903397445c6861a0a56c23e5b2e8f9b9a Author: Jeremy Fitzhardinge Date: Fri Feb 29 18:55:43 2008 +0100 xen: mask out SEP from CPUID Fix 32-on-64 pvops kernel: we don't want userspace using syscall/sysenter, even if the hypervisor supports it, so mask it out from CPUID. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar commit 53c58588107973c0e240a1ed4fb8295f274c409d Author: Dave Anderson Date: Thu Feb 21 11:45:38 2008 -0500 x86 ptrace: fix ptrace_bts_config structure declaration The 2.6.25 ptrace_bts_config structure in asm-x86/ptrace-abi.h is defined with u32 types: #include /* configuration/status structure used in PTRACE_BTS_CONFIG and PTRACE_BTS_STATUS commands. */ struct ptrace_bts_config { /* requested or actual size of BTS buffer in bytes */ u32 size; /* bitmask of below flags */ u32 flags; /* buffer overflow signal */ u32 signal; /* actual size of bts_struct in bytes */ u32 bts_size; }; #endif But u32 is only accessible in asm-x86/types.h if __KERNEL__, leading to compile errors when ptrace.h is included from user-space. The double-underscore versions that are exported to user-space in asm-x86/types.h should be used instead. Signed-off-by: Dave Anderson Signed-off-by: Ingo Molnar commit b4ef95de00be4c2c30feccf607a45093c8c118b7 Author: Ingo Molnar Date: Tue Feb 26 09:40:27 2008 +0100 x86: disable BTS ptrace extensions for now revert the BTS ptrace extension for now. based on general objections from Roland McGrath: http://lkml.org/lkml/2008/2/21/323 we'll let the BTS functionality cook some more and re-enable it in v2.6.26. We'll leave the dead code around to help the development of this code. (X86_BTS is not defined at the moment) Signed-off-by: Ingo Molnar commit 8be8f54bae3453588011cad06363813a5293af53 Author: Thomas Gleixner Date: Sat Feb 23 20:43:21 2008 +0100 x86: CPA: avoid split of alias mappings avoid over-eager large page splitup. When the target area needs to be split or is split already (ioremap) then the current code enforces the split of large mappings in the alias regions even if we could avoid it. Use a separate variable processed in the cpa_data structure to carry the number of pages which have been processed instead of reusing the numpages variable. This keeps numpages intact and gives the alias code a chance to keep large mappings intact. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 757265b8c57bb8fd91785d3d1a87fb483c86c9c2 Author: Ingo Molnar Date: Thu Feb 28 20:19:06 2008 +0100 x86: delay the export removal of init_mm delay the removal of this symbol export by one more kernel release, giving external modules such as VirtualBox a chance to stop using it. Signed-off-by: Ingo Molnar commit b16bf712f491808a8c926dd481c696fe7d73ee5a Author: Ingo Molnar Date: Thu Feb 28 14:02:08 2008 +0100 x86: fix leak un ioremap_page_range() failure Jan Beulich noticed it during code review that if a driver's ioremap() fails (say due to -ENOMEM) then we might leak the struct vm_area. Free it properly. Signed-off-by: Ingo Molnar commit f2dbe03dccc95f41429d60e4221b02fc0f112cc4 Author: Roland McGrath Date: Wed Feb 27 11:42:15 2008 -0800 x86 vdso: fix build locale dependency Priit Laes discovered that the sed command processing nm output was sensitive to locale settings. This was addressed in commit 03994f01e8b72b3d01fd3d09d1cc7c9f421a727c by using [:alnum:] in place of [a-zA-Z0-9]. But that solution too is locale-dependent and may not always match the identifiers it needs to. The better fix is just to run sed et al with a fixed locale setting in all builds. Signed-off-by: Roland McGrath CC: Priit Laes Signed-off-by: Ingo Molnar commit d67bbacb4b557ece3b41abdcb616354ac0ce00e1 Author: Thomas Gleixner Date: Wed Feb 27 09:39:52 2008 +0100 x86: restore vsyscall64 prochandler a recent fix: commit ce28b9864b853803320c3f1d8de1b81aa4120b14 Author: Thomas Gleixner Date: Wed Feb 20 23:57:30 2008 +0100 x86: fix vsyscall wreckage removed the broken /kernel/vsyscall64 handler completely. This triggers the following debug check: sysctl table check failed: /kernel/vsyscall64 No proc_handler Restore the sane part of the proc handler. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit cded932b75ab0a5f9181ee3da34a0a488d1a14fd Author: Hans Rosenfeld Date: Mon Feb 18 18:10:47 2008 +0100 x86: fix pmd_bad and pud_bad to support huge pages I recently stumbled upon a problem in the support for huge pages. If a program using huge pages does not explicitly unmap them, they remain mapped (and therefore, are lost) after the program exits. I observed that the free huge page count in /proc/meminfo decreased when running my program, and it did not increase after the program exited. After running the program a few times, no more huge pages could be allocated. The reason for this seems to be that the x86 pmd_bad and pud_bad consider pmd/pud entries having the PSE bit set invalid. I think there is nothing wrong with this bit being set, it just indicates that the lowest level of translation has been reached. This bit has to be (and is) checked after the basic validity of the entry has been checked, like in this fragment from follow_page() in mm/memory.c: if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd))) goto no_page_table; if (pmd_huge(*pmd)) { BUG_ON(flags & FOLL_GET); page = follow_huge_pmd(mm, address, pmd, flags & FOLL_WRITE); goto out; } Note that this code currently doesn't work as intended if the pmd refers to a huge page, the pmd_huge() check can not be reached if the page is huge. Extending pmd_bad() (and, for future 1GB page support, pud_bad()) to allow for the PSE bit being set fixes this. For similar reasons, allowing the NX bit being set is necessary, too. I have seen huge pages having the NX bit set in their pmd entry, which would cause the same problem. Signed-Off-By: Hans Rosenfeld Signed-off-by: Ingo Molnar commit 3d00daf44654dc75629caf42816ac4e293658724 Author: Roland McGrath Date: Tue Feb 26 13:00:18 2008 -0800 x86: tls prevent_tail_call Fix a kernel bug (vmware boot problem) reported by Tomasz Grobelny, which occurs with certain .config variants and gccs. The x86 TLS cleanup in commit efd1ca52d04d2f6df337a3332cee56cd60e6d4c4 made the sys_set_thread_area and sys_get_thread_area functions ripe for tail call optimization. If the compiler chooses to use it for them, it can clobber the user trap frame because these are asmlinkage functions. Reported-by: Tomasz Grobelny Signed-off-by: Roland McGrath Signed-off-by: Ingo Molnar commit 7be2a03e3174cee3a3cdcdf17db357470f51caff Author: Dmitry Adamushko Date: Fri Feb 8 15:41:13 2008 +0100 softlockup: fix task state setting kthread_stop() can be called when a 'watchdog' thread is executing after kthread_should_stop() but before set_task_state(TASK_INTERRUPTIBLE). Signed-off-by: Dmitry Adamushko Signed-off-by: Ingo Molnar commit 2232c2d8e0a6a31061dec311f3d1cf7624bc14f1 Author: Steven Rostedt Date: Fri Feb 29 18:46:50 2008 +0100 rcu: add support for dynamic ticks and preempt rcu The PREEMPT-RCU can get stuck if a CPU goes idle and NO_HZ is set. The idle CPU will not progress the RCU through its grace period and a synchronize_rcu my get stuck. Without this patch I have a box that will not boot when PREEMPT_RCU and NO_HZ are set. That same box boots fine with this patch. This patch comes from the -rt kernel where it has been tested for several months. Signed-off-by: Steven Rostedt Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit c0f4133b8f70769bc8dda977feb9a29109d6ccca Merge: 99642e2... 0d9ac27... Author: Linus Torvalds Date: Fri Feb 29 08:44:00 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-fix-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-fix-2.6: [ALSA] intel8x0 - Add quirk for Compaq Deskpro EN [ALSA] hda-codec - Adapt eeepc p701 mixer for virtual master control [ALSA] sound: ice1712: unused structs [ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type [ALSA] ASoC: Fix DAPM widget function types in pxa machine drivers [ALSA] hda-codec - Fix mixer names of realtek codecs to adapt mater controls [ALSA] intel8x0 - Add quirk for Acer Travelmate 2310 [ALSA] hda_intel - Add model quirk for Albatron KI690-AM2 motherboard [ALSA] oxygen: add owner field [ALSA] hda-codec - Add Fujitsu Lifebook E8410 to quirk table [ALSA] hda-codec - Fix AD1988 capture elements [ALSA] sb8: fix SB 1.0 capture DMA programming [ALSA] usb-audio: add workaround for broken E-Mu frequency feedback [ALSA] ASoC: Fix TLV320AIC3X PLL divider table for 64 kHz rate [ALSA] hda-codec - Fix Master volume on HP dv8000 commit 99642e211a789df34347c3f10f0301462837f0c5 Merge: 84b9a77... 325d6f5... Author: Linus Torvalds Date: Fri Feb 29 08:43:27 2008 -0800 Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Fix OCD refcounting bug avr32: Call tick_nohz_{stop,restart}_sched_tick() in idle loop avr32: Use correct config symbol in atstk1004 board code avr32: Fix broken pte dump code in do_page_fault() AVR32: Define PAGE_SHARED commit 84b9a774008b132a8b5bd5460f639028a9c7f971 Merge: 3cf9460... 0aef456... Author: Linus Torvalds Date: Fri Feb 29 08:41:13 2008 -0800 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: (35 commits) Blackfin Serial Driver: Fix bug - Only insert UART rx char in timer task. Blackfin Serial Driver: Fix bug - update tx dma buffer tail before wake up processes. Blackfin Serial Driver: Fix bug - Increase buffer tail immediately before starting tx dma. [Blackfin] serial driver: Add flow control support to bf54x [Blackfin] serial driver: Fix bug Poll RTS/CTS status in DMA mode as well [Blackfin] serial driver: ADSP-BF52x arch/mach support [Blackfin] serial driver: use simpler comment headers and strip out information that is maintained in the scm's log [Blackfin] serial driver: rework break flood anomaly handling to be more robust/realistic about what we can actually work around [Blackfin] serial driver: fix bug - cache the bits of the LSR on systems where the LSR is read-to-clear [Blackfin] serial driver: fix bug - should not wait for the TFI bit, just clear it when tx stop. [Blackfin] serial driver: Fix bug serial driver in DMA mode spams history to console on shell restart [Blackfin] serial driver: Fix bug Free rx dma buffer in shutdown. [Blackfin] serial driver: Clean up UART DMA code. Blackfin Serial driver: Fix bug - serial driver in PIO mode cant handle input very quickly [Blackfin] arch: kill section mismatch warnings [Blackfin] arch: handle the most common L1 shrinkage case (L1 does not exist for a part) so that any parts labeled for L1 instead get placed into external memory sections [Blackfin] arch: add bfin_clear_PPIx_STATUS() helper funcs like we have for other parts [Blackfin] arch: make sure we have proper description/copyright/license lines [Blackfin] arch: Fix CONFIG_PM support for BF561 [Blackfin] arch: Remove DPMC char driver option ... commit 3cf9460a999480f444d1b96f09b0640f52b1537e Merge: 57ce36f... 1bd960e... Author: Linus Torvalds Date: Fri Feb 29 08:40:21 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] If you mount an XFS filesystem with no mount options at all, then commit 57ce36feb4d1281247755bc445bae77728298955 Author: Uwe Kleine-König Date: Mon Feb 25 16:45:03 2008 +0100 let __dec_zone_page_state use __dec_zone_state This removes code duplication and makes __dec_zone_page_state look like __inc_zone_page_state. Signed-off-by: Uwe Kleine-König Acked-by: Christoph Lameter Signed-off-by: Linus Torvalds commit 83afdf2464ac17ad6321a68b2fe7528c9aa88016 Merge: 219ff3a... b2d7c7f... Author: Linus Torvalds Date: Fri Feb 29 08:32:15 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: arch/sh/drivers/dma/dma-sh.c: Correct use of ! and & serial: Move asm-sh/sci.h to linux/serial_sci.h. sh: Fix up HAS_SR_RB typo in entry-macros. maple: fix device detection sh: fix rtc_resources setup for sh770x sh: heartbeat: ioremap is expected to succeed sh: Storage class should be before const qualifier maple: remove unused variable sh: SH5-103 needs to select CPU_SH5. sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash. commit 219ff3ad611ecfe8a2fd29b8c50a5313c9d15383 Merge: 547598d... 2335f8e... Author: Linus Torvalds Date: Fri Feb 29 08:29:55 2008 -0800 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: (79 commits) [X25]: Use proc_create() to setup ->proc_fops first [WANROUTER]: Use proc_create() to setup ->proc_fops first [8021Q]: Use proc_create() to setup ->proc_fops first [IPV4]: Use proc_create() to setup ->proc_fops first [IPV6]: Use proc_create() to setup ->proc_fops first [SCTP]: Use proc_create() to setup ->proc_fops first [PKTGEN]: Use proc_create() to setup ->proc_fops first [NEIGHBOUR]: Use proc_create() to setup ->proc_fops first [LLC]: Use proc_create() to setup ->proc_fops first [IPX]: Use proc_create() to setup ->proc_fops first [SUNRPC]: Use proc_create() to setup ->proc_fops first [ATM]: Use proc_create() to setup ->proc_fops first [SCTP]: Update AUTH structures to match declarations in draft-16. [SCTP]: Incorrect length was used in SCTP_*_AUTH_CHUNKS socket option [SCTP]: Clean up naming conventions of sctp protocol/address family registration [APPLETALK]: Use proc_create() to setup ->proc_fops first [BNX2X]: add bnx2x to MAINTAINERS [BNX2X]: update version, remove CVS strings [BNX2X]: Fix Xmit bugs [BNX2X]: Prevent PCI queue overflow ... commit 547598d3a91f11b1f802bf0b122f777c3c22f26d Merge: 5ad5872... be71716... Author: Linus Torvalds Date: Fri Feb 29 08:29:30 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Adjust kernel PC validation test in fault handler. [SPARC64]: Loosen checks in exception table handling. [SPARC64]: Fix section mismatch from kernel_map_range [SPARC64]: Fix section mismatchs from dr_cpu_data [SPARC]: Fix build in arch/sparc/kernel/led.c commit 5ad587283cc15f71bb0e9cb9e0933dd8ebd66e1c Merge: f511d7e... 030f1b2... Author: Linus Torvalds Date: Fri Feb 29 08:28:46 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: MAINTAINERS: neteffect update RDMA/nes: Fix interrupt moderation low threshold RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian RDMA/nes: Fix use-after-free in mini_cm_dec_refcnt_listen() RDMA/nes: Fix use-after-free in nes_create_cq() RDMA/nes: Fix a check-after-use in nes_probe() RDMA/nes: Fix a memory leak in schedule_nes_timer() RDMA/nes: Fix off-by-one RDMA/nes: Resurrect error path dead code RDMA/cxgb3: Fix shift calc in build_phys_page_list() for 1-entry page lists commit f511d7edf53bd49c16131fce28b87428c16239ad Merge: 32fa458... 204f47c... Author: Linus Torvalds Date: Fri Feb 29 08:27:32 2008 -0800 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: remove stale comments from ide-dma.c (take 2) ide: remove ide-tape documentation from Documentation/ide.txt qd65xx: remove commented out code ide-tape: schedule driver for removal after 6 months ide-disk: add missing printk() KERN_* levels ide: fix sparse warning about shadowing 'flags' symbol ide-cd: fix CD/DVD burning ide-cd: fix 'ireason' handling for REQ_TYPE_ATA_PC requests qd65xx: fix setup of QD6580 Control register ide: skip probing port if "hdx=noprobe" was used for both devices on it ide: remove redundant comment from ide_unregister() hpt366: fix section mismatch warnings ide-cd: Enable audio play quirk for Optiarc DVD RW AD-5200A drive commit 32fa458688fa2e68bc433929b2d4941eef7efe39 Author: David Howells Date: Thu Feb 28 13:29:43 2008 +0000 Fix hpet_(un)register_irq_handler() for emulation Fix hpet_(un)register_irq_handler() for when CONFIG_HPET_EMULATE_RTC=n. They are provided macros that substitute value 0, but if they are called as functions and the return value isn't checked, the following warnings appear: drivers/char/rtc.c: In function `rtc_init': drivers/char/rtc.c:1063: warning: statement with no effect drivers/char/rtc.c: In function `rtc_exit': drivers/char/rtc.c:1157: warning: statement with no effect Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit b59931649256685f294d2d163a4f6d6286fbff05 Author: Roland McGrath Date: Tue Feb 26 13:20:58 2008 -0800 elfcore-compat fix uid/gid types I overlooked the difference between __kernel_uid_t and uid_t when defining struct compat_elf_prpsinfo. The result is a regression in 32-bit core dumps on x86_64, where the NT_PRPSINFO note has the wrong size and layout. This patch fixes it. Signed-off-by: Roland McGrath Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 0d9ac27afa469dbb20940ad7f25502785af1cbe3 Author: Takashi Iwai Date: Wed Feb 27 16:40:18 2008 +0100 [ALSA] intel8x0 - Add quirk for Compaq Deskpro EN Added the ac97_quirk hp_only for Compaq Deskpro EN. Signed-off-by: Takashi Iwai commit b4818494edddfe382de4f5d072cb527b60315a46 Author: Herton Ronaldo Krzesinski Date: Sat Feb 23 11:34:12 2008 +0100 [ALSA] hda-codec - Adapt eeepc p701 mixer for virtual master control Fix the line-out volume control of eeepc p701 to be a proper slave of the virtual master control. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 008f3599ef97438900d62fe05d75535d114780fc Author: Harvey Harrison Date: Fri Feb 29 11:46:32 2008 +0100 [ALSA] sound: ice1712: unused structs Don't need to declare a struct when defining a structure layout. Both of these structs are unused. sound/pci/ice1712/revo.c:39:3: warning: symbol 'revo51' was not declared. Should it be static? sound/pci/ice1712/phase.c:54:3: warning: symbol 'phase28' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: Takashi Iwai commit 3fffe871b93f957bea443e85f6b221c50bbf9f97 Author: Jarkko Nikula Date: Thu Feb 28 12:35:25 2008 +0100 [ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type Add kcontrol argument to function since the API was changed by the commit 9af6d9562414568ecadf96aaef5b88e7e8b19821. Signed-off-by: Jarkko Nikula Signed-off-by: Takashi Iwai commit 338c7ed070bb1e068c3ae8ef14dc577e75d8aecc Author: Jarkko Nikula Date: Thu Feb 28 12:34:48 2008 +0100 [ALSA] ASoC: Fix DAPM widget function types in pxa machine drivers Add kcontrol argument to functions since the API was changed by the commit 9af6d9562414568ecadf96aaef5b88e7e8b19821. Signed-off-by: Jarkko Nikula Signed-off-by: Takashi Iwai commit 31bffaa9435f14b35a8e23ed2005925f65ec6d9b Author: Takashi Iwai Date: Wed Feb 27 16:10:44 2008 +0100 [ALSA] hda-codec - Fix mixer names of realtek codecs to adapt mater controls Some models like eeepc ep20 have invalid mixer names that aren't handled properly by virtual master controls. Rename them to the proper names. Also fixed some typos in the mixer names but they are not compiled in right now. Signed-off-by: Takashi Iwai commit b6a370b6fb3114f9f7fc8a393c3ffc2236d7cbf1 Author: Takashi Iwai Date: Mon Feb 4 14:00:53 2008 +0100 [ALSA] intel8x0 - Add quirk for Acer Travelmate 2310 Added ac97_quirk=hp-only for Acer Travelmate 2310. ALSA bug#3656 https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3656 Signed-off-by: Takashi Iwai commit 0b167bf456d4af58103e2072bc4bd5733e7e7579 Author: Andrew Paprocki Date: Sun Feb 3 10:15:44 2008 +0100 [ALSA] hda_intel - Add model quirk for Albatron KI690-AM2 motherboard This adds a quirk to the Realtek ALC883 table for the Albatron KI690-AM2 motherboard to use the 6stack-dig model. Signed-off-by: Andrew Paprocki Signed-off-by: Takashi Iwai commit b930b9f41d5e9eadd9041f273c4d6d18e7061d05 Author: Clemens Ladisch Date: Tue Feb 26 08:40:57 2008 +0100 [ALSA] oxygen: add owner field I forgot to set the module owner for the HiFier/Xonar models. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 3f1eeaed2c0dc6c787a47ae7a6c774589a04a3a2 Author: Tony Vroon Date: Mon Feb 25 16:44:13 2008 +0100 [ALSA] hda-codec - Add Fujitsu Lifebook E8410 to quirk table Add the proper model entry for Fujitsu Lifebook E8410 with ALC262 codec. From: Tony Vroon Signed-off-by: Takashi Iwai commit fb304ce53afbb653bfa67cc81ee9cf06edcbf68e Author: Takashi Iwai Date: Mon Feb 25 15:32:01 2008 +0100 [ALSA] hda-codec - Fix AD1988 capture elements The some indices of capture elements of AD1988 are wrongly assigned. This patch fixes it. See ALSA bug#3795 https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3795 Signed-off-by: Takashi Iwai commit 20cde9e8f83711dca532c49605914d50292d9ce5 Author: Clemens Ladisch Date: Mon Feb 25 11:04:41 2008 +0100 [ALSA] sb8: fix SB 1.0 capture DMA programming Fix a wrong version check that would cause an invalid command to be sent to SB 1.0 chips. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d513202efd5bb9974545ef1c7f951467b21eb3a5 Author: Clemens Ladisch Date: Mon Feb 25 11:01:00 2008 +0100 [ALSA] usb-audio: add workaround for broken E-Mu frequency feedback Add a workaround for the feedback pipe of E-Mu 0202/0404 USB devices that reports the number of samples per packet instead of the number of samples per microframe. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit ee47fd12d73706edb2a10efd05d5eed15b4d1e08 Author: Jarkko Nikula Date: Wed Feb 20 17:13:15 2008 +0100 [ALSA] ASoC: Fix TLV320AIC3X PLL divider table for 64 kHz rate Signed-off-by: Jarkko Nikula Signed-off-by: Takashi Iwai commit b84f08d49188a18d965fab8463c9cb679785eb39 Author: Takashi Iwai Date: Mon Feb 18 12:36:11 2008 +0100 [ALSA] hda-codec - Fix Master volume on HP dv8000 HP dv8000 laptop has a problem with Master volume. It's due to the connection of the widget 0x13. When it's connected from the analog amp mixer (0x19), it works as expected mysteriously (ALSA bug#3775): https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3775 Signed-off-by: Takashi Iwai commit be71716e464f4ea38f08034dc666f2feb55535d9 Author: David S. Miller Date: Thu Feb 28 20:38:15 2008 -0800 [SPARC64]: Adjust kernel PC validation test in fault handler. Because of the new futex validation init handler, we have to accept faults in init section text as well as the normal kernel text. Thanks to Tom Callaway for the bug report. Signed-off-by: David S. Miller commit 1bd960ee2b1231759bd485aad0fa483c2f793a3b Author: Josef Jeff Sipek Date: Fri Feb 29 13:58:40 2008 +1100 [XFS] If you mount an XFS filesystem with no mount options at all, then the "ikeep" option is set rather than "noikeep". This regression was introduced in 970451. With no mount options specified, xfs_parseargs() does the following: int ikeep = 0; args->flags |= XFSMNT_BARRIER; args->flags2 |= XFSMNT2_COMPAT_IOSIZE; if (!options) goto done; It only sets the above two options by default and before, it also used to set XFSMNT_IDELETE by default. If options are specified, then if (!(args->flags & XFSMNT_DMAPI) && !ikeep) args->flags |= XFSMNT_IDELETE; is executed later on which is skipped by the "goto done;" above. The solution is to invert the logic. SGI-PV: 977771 SGI-Modid: xfs-linux-melb:xfs-kern:30590a Signed-off-by: Niv Sardi Signed-off-by: Barry Naujok Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Lachlan McIlroy commit 0aef45645174525ee6aa7baed247a130e052740d Author: Sonic Zhang Date: Fri Feb 29 12:08:42 2008 +0800 Blackfin Serial Driver: Fix bug - Only insert UART rx char in timer task. http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3910 Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 931506d3b2208362efc678ee863ee42a90755e89 Author: Anantha Subramanyam Date: Thu Feb 28 15:58:35 2008 -0800 sata_svw: Add support for HT1100 SATA controller This patch adds support (including ATAPI DMA) for HT1100 (aka BCM11000) SATA controller. Signed-off-by: Anantha Subramanyam Signed-off-by: Jeff Garzik commit 2335f8ec27e125208d8d2d3e257a82862c4977d6 Author: Wang Chen Date: Thu Feb 28 14:16:33 2008 -0800 [X25]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 6d37a1581695fba42f4b51e3ff4c2871552cd6d7 Author: Wang Chen Date: Thu Feb 28 14:15:56 2008 -0800 [WANROUTER]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit d45fba3625249fada590a2eea09c38e755a3a2a7 Author: Wang Chen Date: Thu Feb 28 14:14:58 2008 -0800 [8021Q]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 770207208e4374f013f6f49233d5c8c8df505e03 Author: Wang Chen Date: Thu Feb 28 14:14:25 2008 -0800 [IPV4]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 4436f4cbfac15acea139863e322ed2f9efb118d3 Author: Wang Chen Date: Thu Feb 28 14:13:46 2008 -0800 [IPV6]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 160f17e345f5b50484d6cdc985b8686a05bf015d Author: Wang Chen Date: Thu Feb 28 14:13:16 2008 -0800 [SCTP]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 25296d599ccc7e06af217329729e4d7154fa79a2 Author: Wang Chen Date: Thu Feb 28 14:11:49 2008 -0800 [PKTGEN]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 46ecf0b994715589b9f5f620beca4d6aaaa02028 Author: Wang Chen Date: Thu Feb 28 14:10:51 2008 -0800 [NEIGHBOUR]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 7e0218099832d954d107f48de9e81bd521e16f24 Author: Wang Chen Date: Thu Feb 28 14:08:54 2008 -0800 [LLC]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 1e15dc981deb39056fa846fe55e1a1dbb175a98e Author: Wang Chen Date: Thu Feb 28 14:06:14 2008 -0800 [IPX]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 2ce8f047d5f3c0d782838bd2ecb6e4c440268e6d Author: Wang Chen Date: Thu Feb 28 14:00:59 2008 -0800 [SUNRPC]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 64758bd7927be1f755e7a08edb2253d37e4b2445 Merge: 16e297b... 7e8616d... Author: David S. Miller Date: Thu Feb 28 13:56:37 2008 -0800 Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev commit 16e297b35811c53288b35e15a5823fd8534c6d21 Author: Wang Chen Date: Thu Feb 28 13:55:45 2008 -0800 [ATM]: Use proc_create() to setup ->proc_fops first Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 7e8616d8e7731b026019d9af7cc9914b8bb42bc7 Author: Vlad Yasevich Date: Wed Feb 27 16:04:52 2008 -0500 [SCTP]: Update AUTH structures to match declarations in draft-16. The new SCTP socket api (draft 16) updates the AUTH API structures. We never exported these since we knew they would change. Update the rest to match the draft. Signed-off-by: Vlad Yasevich commit b40db6846847e82daf175641987df29324c425fa Author: Vlad Yasevich Date: Wed Feb 27 14:40:37 2008 -0500 [SCTP]: Incorrect length was used in SCTP_*_AUTH_CHUNKS socket option The chunks are stored inside a parameter structure in the kernel and when we copy them to the user, we need to account for the parameter header. Signed-off-by: Vlad Yasevich commit 15efbe763978d7cc327d824d9e8f8f9e525dd40d Author: Neil Horman Date: Fri Feb 15 09:53:59 2008 -0500 [SCTP]: Clean up naming conventions of sctp protocol/address family registration I noticed while looking into some odd behavior in sctp, that the variable name sctp_pf_inet6_specific was used twice to represent two different pieces of data (its both a structure name and a pointer to that type of structure), which is confusing to say the least, and potentially dangerous depending on the variable scope. This patch cleans that up, and makes the protocol and address family registration names in SCTP more regular, increasing readability. Signed-off-by: Neil Horman Signed-off-by: Vlad Yasevich ipv6.c | 12 ++++++------ protocol.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) commit ed2b5b474e853fe2f9a9988f2871051291779d90 Author: Wang Chen Date: Thu Feb 28 12:53:32 2008 -0800 [APPLETALK]: Use proc_create() to setup ->proc_fops first As Davem mentioned in his recently patch (d9595a7b9c777d45a74774f1428c263a0a47f4c0) that the procfs visibility should occur after the ->proc_fops are setup. And also, Alexey provide proc_create() to make sure that ->proc_fops is setup before gluing PDE to main tree. We use proc_create(). Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 4d9d2cb026c756318965e2d9874d4695d9ebd4f6 Author: Eliezer Tamir Date: Thu Feb 28 11:59:10 2008 -0800 [BNX2X]: add bnx2x to MAINTAINERS Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 8d84a44096a34a5015fef8293fe1bf70068bfdd0 Author: Eliezer Tamir Date: Thu Feb 28 11:58:49 2008 -0800 [BNX2X]: update version, remove CVS strings Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 96fc1784007bf194399759e9b7d9c836c7bbda2a Author: Eliezer Tamir Date: Thu Feb 28 11:57:55 2008 -0800 [BNX2X]: Fix Xmit bugs Several endianity corrections in start_xmit() Fixed TSO bug where packets were missing the TCP flags. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit e8717a47266b1527e620ddf262613b9d010bbbe7 Author: Eliezer Tamir Date: Thu Feb 28 11:57:29 2008 -0800 [BNX2X]: Prevent PCI queue overflow Limit traffic through an internal queue to prevent overflow. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 228241eb58ad13e7cf2ddd9c92eabb5c3055cf5c Author: Eliezer Tamir Date: Thu Feb 28 11:56:57 2008 -0800 [BNX2X]: fix slowpath races and locking Fixed locking between fastpath and slowpath operations. Corrected order of traffic disabling to prevent race when going down under traffic. - first have the microcode drop all incoming packets - then do the slowpath stuff - only then reset the MAC Got rid of in_reset_task. Remove_one() and friends would deference a null pointer if init_one failed. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 877e9aa4c31d8d1670b21824b819929435f46579 Author: Eliezer Tamir Date: Thu Feb 28 11:55:53 2008 -0800 [BNX2X]: fix HW attentions and error handling Some of the HW attentions, used to indicate an error were not properly acked. This will cause the driver to endlessly receive interrupts when such an error happens. Had to break the code into smaller chunks because it got too nested. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 615f8fd9c2ab475c420d5baa7def37c5cb0d50d3 Author: Eliezer Tamir Date: Thu Feb 28 11:54:54 2008 -0800 [BNX2X]: fix MSI-X/INT#A errata Errata A0.158 workaround. Running in INT#A mode after running with MSI-X fails due to a PCI core bug. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 0e39e645b3e83873d59b865df2b671c822e2182c Author: Eliezer Tamir Date: Thu Feb 28 11:54:03 2008 -0800 [BNX2X]: correct statistics Errors were summed improperly, some stats were missing. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 49d66772112f40554ba18d037e0601ac3da0bf79 Author: Eliezer Tamir Date: Thu Feb 28 11:53:13 2008 -0800 [BNX2X]: Correct RX filtering and MC configuration The configuration of RX filtering needed the following corrections: Drop flags need to be set per Rx queue. Have to tell the microcode to collect drop stats, and properly wait for them to complete when going down. Sometimes we failed to detect proper completion due to a logical error in the wait loop. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit f14106478e372e64be54a3cdab1e2fa83a5c8a35 Author: Eliezer Tamir Date: Thu Feb 28 11:51:50 2008 -0800 [BNX2X]: Correct Link management Properly protect PHY access between two devices on the same board with a HW lock. Use GPIO to clear all previous configurations before changing link parameters. Shut down the external PHY in case of fan failure. Reducing the MDC/MDIO clock to 2.5MHz due to problems with some devices. Resolve the flow control response according to autoneg with external PHY. Unmasking all PHY interrupts in single write to prevent a race in the interrupts order. LASI indication fixes to work with peculiarities of PHYs. Disable MAC RX to avoid a HW bug when closing the MAC under traffic. Disable parallel detection on HiGig due to HW limitation. Updating the shared memory structure to work with the current bootcode. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 250479504ff7d7e8c7d5cf85bedd40fb8d725429 Author: Eliezer Tamir Date: Thu Feb 28 11:50:16 2008 -0800 [BNX2X]: Correct init_one() Correct PCI-E info printed by init_one() In one case it failed to free the netdev. Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit c14423fe585a5937db6e2eece4b79486521103be Author: Eliezer Tamir Date: Thu Feb 28 11:49:42 2008 -0800 [BNX2X]: Spelling fixes Signed-off-by: Eliezer Tamir Signed-off-by: David S. Miller commit 21e43188f272c7fd9efc84b8244c0b1dfccaa105 Author: Herbert Xu Date: Thu Feb 28 11:23:17 2008 -0800 [IPCOMP]: Disable BH on output when using shared tfm Because we use shared tfm objects in order to conserve memory, (each tfm requires 128K of vmalloc memory), BH needs to be turned off on output as that can occur in process context. Previously this was done implicitly by the xfrm output code. That was lost when it became lockless. So we need to add the BH disabling to IPComp directly. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 60717f7e761ca04925d17e90e556e689ab134cdc Merge: fbabbed... 2d8d4fd... Author: David S. Miller Date: Thu Feb 28 11:03:29 2008 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 2d8d4fdf78488f3362dccfd2a6bfdb4bc65c0858 Author: Aurelien Jarno Date: Thu Feb 28 15:11:26 2008 +0100 SSB PCI core driver: use new SPROM data structure Switch the SSB PCI core driver to the new SPROM data structure now that the old one has been removed. Signed-off-by: Aurelien Jarno Acked-by: Michael Buesch Signed-off-by: John W. Linville commit f9d8f88952c263a4eeaaa0fc6ff726d2315b6a57 Author: Alexey Zaytsev Date: Sat Feb 23 13:33:07 2008 +0300 Don't build bcm43xx if SSB is static and b43 PCI-SSB bridge is enabled. This may happen e.g. when the ssb is statically enables by the b44 driver, and the b43 pci-ssb bridge is enbled by the b43/b43legacy drivers, or the b43/b43legacy drivers are built statically. Signed-off-by: Alexey Zaytsev Acked-by: Larry Finger Signed-off-by: John W. Linville commit c7084535c9d2b8bcfc19f1ad9452eabde742ae22 Author: Alexey Zaytsev Date: Sat Feb 23 12:59:26 2008 +0300 Use a separate config option for the b43 pci to ssb bridge. The bridge code was unnecessary enabled by the b44 driver, but it prevents the bcm43xx driver from being loaded, as the bridge claims the same pci ids. Now we enable the birdge only if the b43{legacy} drivers are selected. Signed-off-by: Alexey Zaytsev Acked-by: Larry Finger Signed-off-by: John W. Linville commit 4b7524a42e14a7f86fa12611f3419650e99e2526 Author: Roland Dreier Date: Tue Feb 26 15:26:56 2008 +0100 libertas: Remove unused exports The libertas driver exports a number of symbols with no in-tree users; remove these unused exports. lbs_reset_device() is completely unused, with no callers at all, so remove the function completely. A couple of these unused exported symbols are static, which causes the following build error on ia64 with gcc 4.2.3: drivers/net/wireless/libertas/main.c:1375: error: __ksymtab_lbs_remove_mesh causes a section type conflict drivers/net/wireless/libertas/main.c:1354: error: __ksymtab_lbs_add_mesh causes a section type conflict Signed-off-by: Roland Dreier Acked-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 03147dfc8a3756439f0cc54aa181f30067f1b21b Author: Johannes Berg Date: Tue Feb 26 00:39:28 2008 +0100 mac80211: fix kmalloc vs. net_ratelimit The "goto end;" part definitely must not be rate limited. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 53b3f8e47a38f39836da1c9f9d2ea9a9c164c8f4 Author: Ivo van Doorn Date: Mon Feb 25 23:15:13 2008 +0100 rt2x00: Fix rt2x00lib_reset_link_tuner() rt2x00lib_reset_link_tuner() can be called from within the link tuner itself. This means that it should _not_ call rt2x00lib_stop_link_tuner() since that will cause the thread to hang. Reorder the things that should be done during a link tuner reset and during a link tuner start. Also make antenna tuning the last step of the link tuner since it could possibly reset some statistical information which we need for average calculation. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 05253c93feb40901d80a0d6f239a0bc78860c679 Author: Ivo van Doorn Date: Mon Feb 25 23:15:08 2008 +0100 rt2x00: Don't switch to antenna with low rssi When rssi_a > rssi_b is true and the current antenna was already antenna A, then rt2x00 incorrectly jumped to antenna B. Also don't configure the antenna when there has been no change in the antenna setup. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 61667d8d5bf3c3ee09474069eaf4b93a4755ff8b Author: Ivo van Doorn Date: Mon Feb 25 23:15:05 2008 +0100 rt2x00: Add link tuner safe RX toggle states This adds 2 new states which both are used to toggle the RX. These new states are required for usage inside the link tuner thread, because the normal RX toggling will stop the link tuner thread. While it is possible that the link tuner thread itself is the caller of the RX toggle (when using software antenna diversity). Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit b290d433618aa7122f6e6c4a62ddc79412a48d4d Author: Ivo van Doorn Date: Mon Feb 25 23:15:01 2008 +0100 rt2x00: Fix antenna diversity Fix 2 issues in antenna diversity selection. 1) the following statement will always return true. if ((rssi_curr - rssi_old) > -5 || (rssi_curr - rssi_old) < 5) It is cleaner to check if the absolute value is smaller then 5. 2) Only enable software diversity when default antenna setup indicates support for it. Don't select it when the hardware does not indicate support for it... Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8bfb04756a698e38825656eab3bc339a321551b3 Author: Sebastian Siewior Date: Sat Feb 23 21:46:31 2008 +0100 gelic wireless driver needs WIRELESS_EXT support | CC drivers/net/ps3_gelic_wireless.o | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c: In function 'gelic_wl_setup_netdev_ops': | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2660: error: 'struct net_device' has no member named 'wireless_data' | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2661: error: 'struct net_device' has no member named 'wireless_handlers' | make[3]: *** [drivers/net/ps3_gelic_wireless.o] Error 1 | make[2]: *** [drivers/net] Error 2 | make[1]: *** [drivers] Error 2 | make[1]: *** Waiting for unfinished jobs.... | make: *** [sub-make] Error 2 Signed-off-by: Sebastian Siewior Acked-by: Masakazu Mokuno Signed-off-by: John W. Linville commit 4b74850dc3fb8a0941dde0f1bf7686803d1250cd Author: Masakazu Mokuno Date: Fri Feb 22 16:45:26 2008 +0900 PS3: gelic: Link the wireless net_device structure to the corresponding device structure Link the net_device structure of the wireless part to the corresponding device structure. Without this, the sysfs node for this net_device would not have 'device' link. Signed-off-by: Masakazu Mokuno Acked-by: Dan Williams Signed-off-by: John W. Linville commit 5b0acc64a3750f8f017b973f1059bb25b791c2a3 Author: Johannes Berg Date: Wed Feb 20 11:47:45 2008 +0100 rndis_wlan: fix sparse warnings It is obviously wrong to use an enum in a little endian struct, and those other enums should be declared differently. Signed-off-by: Johannes Berg Acked-by: Jussi Kivilinna Signed-off-by: John W. Linville commit b90a137d30a6322d76023d879d40fc31f3edf0a6 Author: Vlad Yasevich Date: Thu Feb 14 10:18:20 2008 -0500 [SCTP]: Correctly set the length of sctp_assoc_change notification sctp_assoc_change notification may contain the data from a received ABORT chunk. Set the length correctly to account for that. Signed-off-by: Vlad Yasevich commit fbabbed8284d1526ed01754ecd4fabdb941a1ff2 Author: Patrick McHardy Date: Wed Feb 27 12:21:18 2008 -0800 [NETFILTER]: Fix NF_QUEUE_NR() parenthesis Properly add parens around the macro argument. This is not needed by the kernel but the macro is exported to userspace, so it shouldn't make any assumptions. Also use NF_VERDICT_BITS instead of NF_VERDICT_QBTIS for the left-shift since thats whats logically correct. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6556874dc3770aefae89907b3cf9be8e23d66137 Author: Jan Engelhardt Date: Wed Feb 27 12:20:41 2008 -0800 [NETFILTER]: xt_conntrack: fix IPv4 address comparison Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d61f89e9417e68caf9ca801606694c1c960ad179 Author: Jan Engelhardt Date: Wed Feb 27 12:09:05 2008 -0800 [NETFILTER]: xt_conntrack: fix missing boolean clamping Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4e29e9ec7e0707d3925f5dcc29af0d3f04e49833 Author: Patrick McHardy Date: Wed Feb 27 12:07:47 2008 -0800 [NETFILTER]: nf_conntrack: fix smp_processor_id() in preemptible code warning Since we're using RCU for the conntrack hash now, we need to avoid getting preempted or interrupted by BHs while changing the stats. Fixes warning reported by Tilman Schmidt when using preemptible RCU: [ 48.180297] BUG: using smp_processor_id() in preemptible [00000000] code: ntpdate/3562 [ 48.180297] caller is __nf_conntrack_find+0x9b/0xeb [nf_conntrack] [ 48.180297] Pid: 3562, comm: ntpdate Not tainted 2.6.25-rc2-mm1-testing #1 [ 48.180297] [] debug_smp_processor_id+0x99/0xb0 [ 48.180297] [] __nf_conntrack_find+0x9b/0xeb [nf_conntrack] Tested-by: Tilman Schmidt Tested-by: Christian Casteyde [Bugzilla #10097] Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3bdfe7ec08b4256121a8894cd978e74fcf7031d7 Author: YOSHIFUJI Hideaki Date: Wed Feb 27 12:06:38 2008 -0800 [IPV6] SYSCTL: Fix possible memory leakage in error path. In error path, we do need to free memory just allocated. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 325d6f5593b40b5a48cf4ade74c01681f2ff6044 Author: Haavard Skinnemoen Date: Wed Feb 27 14:04:29 2008 +0100 avr32: Fix OCD refcounting bug Iff the parent has TIF_DEBUG set, _and_ clone_flags includes CLONE_PTRACE we should set the TIF_DEBUG flag for the child and increment the ocd refcount. Otherwise, the TIF_DEBUG flag must be unset. Currently, the child inherits TIF_DEBUG from the parent before copy_thread is called, so TIF_DEBUG may be already be set before we determine whether the child is supposed to inherit debugging capabilities from the parent or not. This means that ocd_enable() won't increment the refcount, because TIF_DEBUG is already set, and that TIF_DEBUG will be set for processes that aren't being debugged. This leads to a refcounting asymmetry, which may show up as ------------[ cut here ]------------ Badness at arch/avr32/kernel/ocd.c:73 PC is at ocd_disable+0x34/0x60 LR is at put_lock_stats+0xa/0x20 as reported by David Brownell. Happens when strace'ing a process that forks a new child process, e.g. "strace mount -tjffs2 mtd1 /mnt", and subsequently killing the child process (e.g. "umount /mnt".) Signed-off-by: Haavard Skinnemoen commit b37d428b24ad38034f56b614de05686ba151b614 Author: Pavel Emelyanov Date: Tue Feb 26 23:51:04 2008 -0800 [INET]: Don't create tunnels with '%' in name. Four tunnel drivers (ip_gre, ipip, ip6_tunnel and sit) can receive a pre-defined name for a device from the userspace. Since these drivers call the register_netdevice() (rtnl_lock, is held), which does _not_ generate the device's name, this name may contain a '%' character. Not sure how bad is this to have a device with a '%' in its name, but all the other places either use the register_netdev(), which call the dev_alloc_name(), or explicitly call the dev_alloc_name() before registering, i.e. do not allow for such names. This had to be prior to the commit 34cc7b, but I forgot to number the patches and this one got lost, sorry. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit d9595a7b9c777d45a74774f1428c263a0a47f4c0 Author: David S. Miller Date: Tue Feb 26 22:20:44 2008 -0800 [AF_KEY]: Fix oops by converting to proc_net_*(). To make sure the procfs visibility occurs after the ->proc_fs ops are setup, use proc_net_fops_create() and proc_net_remove(). This also fixes an OOPS after module unload in that the name string for remove was wrong, so it wouldn't actually be removed. That bug was introduced by commit 61145aa1a12401ac71bcc450a58c773dd6e2bfb9 ("[KEY]: Clean up proc files creation a bit.") Signed-off-by: David S. Miller commit 78374676efae525094aee45c0aab4bcab95ea9d1 Author: Li Zefan Date: Tue Feb 26 18:25:53 2008 -0800 CONNECTOR: make cn_already_initialized static It is used in connector.c only, so make it static. Signed-off-by: Li Zefan Signed-off-by: David S. Miller commit 148f97292e8fa2c35fcef60a7725cf1b073d6818 Author: Bjorn Mork Date: Tue Feb 26 18:17:53 2008 -0800 [IPV4]: Reset scope when changing address This bug did bite at least one user, who did have to resort to rebooting the system after an "ifconfig eth0 127.0.0.1" typo. Deleting the address and adding a new is a less intrusive workaround. But I still beleive this is a bug that should be fixed. Some way or another. Another possibility would be to remove the scope mangling based on address. This will always be incomplete (are 127/8 the only address space with host scope requirements?) We set the scope to RT_SCOPE_HOST if an IPv4 interface is configured with a loopback address (127/8). The scope is never reset, and will remain set to RT_SCOPE_HOST after changing the address. This patch resets the scope if the address is changed again, to restore normal functionality. Signed-off-by: Bjorn Mork Signed-off-by: David S. Miller commit f1243c2db6e3b8e5a602b1be2d256b582fc78ce4 Author: Benjamin Thery Date: Tue Feb 26 18:10:03 2008 -0800 [IPV6]: Add missing initializations of the new nl_info.nl_net field Add some more missing initializations of the new nl_info.nl_net field in IPv6 stack. This field will be used when network namespaces are fully supported. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 3dbf8d56a2b7e0d738950daa16682e1e6dafb28b Author: Patrick McHardy Date: Tue Feb 26 17:52:05 2008 -0800 [MACVLAN]: Update Kconfig to refer to iproute Since the macvlan release I had at least 5 users asking how to configure it since the old userspace tool doesn't work with the version in the kernel. Add a pointer to the Kconfig help. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ab2273175bd59616b6e85c0f88b154e8bd97413 Author: Thomas Gleixner Date: Tue Feb 26 17:42:56 2008 -0800 bluetooth: delete timer in l2cap_conn_del() Delete a possibly armed timer before kfree'ing the connection object. Solves: http://lkml.org/lkml/2008/2/15/514 Reported-by:Quel Qun Signed-off-by: Thomas Gleixner Signed-off-by: David S. Miller commit 622eaec613130e6ea78f2a5d5070e3278b21cd8f Author: David S. Miller Date: Tue Feb 26 17:30:02 2008 -0800 [SPARC64]: Loosen checks in exception table handling. Some parts of the kernel now do things like do *_user() accesses while set_fs(KERNEL_DS) that fault on purpose. See, for example, the code added by changeset a0c1e9073ef7428a14309cba010633a6cd6719ea ("futex: runtime enable pi and robust functionality"). That trips up the ASI sanity checking we make in do_kernel_fault(). Just remove it for now. Maybe we can add it back later with an added conditional which looks at the current get_fs() value. Signed-off-by: David S. Miller commit b2d7c7f7a69fd953626c3e507bac70e18b21f70e Author: Julia Lawall Date: Tue Feb 26 21:42:11 2008 +0100 arch/sh/drivers/dma/dma-sh.c: Correct use of ! and & In commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337, a bug was fixed that involved converting !x & y to !(x & y). The code below shows the same pattern, and thus should perhaps be fixed in the same way. This is not tested and clearly changes the semantics, so it is only something to consider. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ expression E1,E2; @@ ( !E1 & !E2 | - !E1 & E2 + !(E1 & E2) ) // Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 030f1b2f5d880c1ad3d7e0b71fc383f00f38f8f7 Author: Roland Dreier Date: Thu Feb 21 09:02:41 2008 -0600 MAINTAINERS: neteffect update Adding Nishi to the maintainers list. Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 4b1cc7e7ca5715907d17619dcb49144db6efe1c9 Author: John Lacombe Date: Thu Feb 21 08:34:58 2008 -0600 RDMA/nes: Fix interrupt moderation low threshold Interrupt moderation low threshold value was incorrectly triggering, indicating that the threshold should be lowered. The impact was the timer was likely to become 40usecs and get stuck there. The biggest side effect was too many interrupts and nonoptimal performance. Signed-off-by: John Lacombe Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 30da7cff87f0ffa169fe07b766c3d6a5f6d1f6ab Author: Faisal Latif Date: Thu Feb 21 08:31:22 2008 -0600 RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian With commit ef19454b ("[LIB] crc32c: Keep intermediate crc state in cpu order"), the behavior of crc32c changes on big-endian platforms. Our algorithm expects the previous behavior; otherwise we have RDMA connection establishment failure on big-endian platforms like powerpc. Apply cpu_to_le32() to value returned by crc32c() to get the previous behavior. Signed-off-by: Faisal Latif Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit a2e9c384ce76993cd68d6de57eaa81985b4618e3 Author: Faisal Latif Date: Thu Feb 21 08:27:32 2008 -0600 RDMA/nes: Fix use-after-free in mini_cm_dec_refcnt_listen() Fix use-after-free spotted by Coverity checker flagged by Adrian Bunk. Signed-off-by: Faisal Latif Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit f84fba6f969065c6622669bbaa955c26fc1461ae Author: Glenn Streiff Date: Thu Feb 21 08:17:54 2008 -0600 RDMA/nes: Fix use-after-free in nes_create_cq() Just delete the debugging statement so we don't use cqp_request after freeing it. Adrian Bunk flagged this use-after-free issue spotted by the Coverity checker. Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit a4435febd4c0f14b25159dca249ecf91301c7c76 Author: Adrian Bunk Date: Thu Feb 21 08:13:47 2008 -0600 RDMA/nes: Fix a check-after-use in nes_probe() Fix a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit ed0ba33d64fb933f5fd985aa8f641984efd9d658 Author: Adrian Bunk Date: Thu Feb 21 08:12:06 2008 -0600 RDMA/nes: Fix a memory leak in schedule_nes_timer() Fix a memory leak spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 204f47c5a581630369d425b5a4afa48448c30359 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:36 2008 +0100 ide: remove stale comments from ide-dma.c (take 2) - ide-dma.c is not a separate module - ide-dma.c is not PCI specific anymore - DMA is enabled by default nowadays - link for Intel Zappa BIOS is dead etc. v2: * Some comments should be preserved. (Noticed by Mark Lord) Cc: Mark Lord Signed-off-by: Bartlomiej Zolnierkiewicz commit 56467d17d205368f857e194858ea69368a1cfec2 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:36 2008 +0100 ide: remove ide-tape documentation from Documentation/ide.txt More complete documentation is available in Documentation/ide/ide-tape.txt. Signed-off-by: Bartlomiej Zolnierkiewicz commit fcac6f87a5642ab16fe3deab11e57252dacf4d55 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:36 2008 +0100 qd65xx: remove commented out code Signed-off-by: Bartlomiej Zolnierkiewicz commit d48567dd43868b3d2e1fcc33ee76dc2d38a1ddeb Author: Borislav Petkov Date: Tue Feb 26 21:50:36 2008 +0100 ide-tape: schedule driver for removal after 6 months Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit d12faa2736ebdee025a9aa07b2683c5fa8c86553 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:36 2008 +0100 ide-disk: add missing printk() KERN_* levels Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit dbecebca1914f414008553b57aefde95b70f9142 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:35 2008 +0100 ide: fix sparse warning about shadowing 'flags' symbol drivers/ide/ide.c:801:18: warning: symbol 'flags' shadows an earlier one drivers/ide/ide.c:732:16: originally declared here Also fix some whitespace damage while at it. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit bcd88ac3b2ff2eae3d0fa57a6b02d4fce5392f32 Author: Andreas Schwab Date: Tue Feb 26 21:50:35 2008 +0100 ide-cd: fix CD/DVD burning Move counting of sense bytes into the transfer loop. Signed-off-by: Andreas Schwab Acked-by: Borislav Petkov Cc: Kiyoshi Ueda Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 9f10d9ee0ac6d79d7bc8b9a158bf4a29322d84d3 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:35 2008 +0100 ide-cd: fix 'ireason' handling for REQ_TYPE_ATA_PC requests Pass 'struct request *rq' to ide_cd_check_ireason() from cdrom_newpc_intr() and use ide_cd_check_ireason() also for REQ_TYPE_ATA_PC requests. This fixes some hangs caused by not finishing the transfer before ending the request and also makes use of 'ireason == 1' quirk for spurious IRQs. Tested-by: Brad Rosser Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 788d669736dd3d15195fea07bf97ec5a2e9f15e7 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:35 2008 +0100 qd65xx: fix setup of QD6580 Control register Control register of QD6580 should be setup before probing for devices. Signed-off-by: Bartlomiej Zolnierkiewicz commit c53ea18dc29a1ac075119f651d6ac4386a549a34 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:34 2008 +0100 ide: skip probing port if "hdx=noprobe" was used for both devices on it * Skip probing port if "hdx=noprobe" parameter was used for both devices on it. * Obsolete "idex=noprobe" parameter - it only works for ide_generic, cmd640 and PCI hosts in Compatibility mode (on alpha/x86/ia64/m32r/mips/ppc32). Signed-off-by: Bartlomiej Zolnierkiewicz commit cbd34d00af2960097ebd46a31dabc8bb9f16ea4e Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 26 21:50:33 2008 +0100 ide: remove redundant comment from ide_unregister() Identical comment is present in ide_hwif_release_regions() documentation. Signed-off-by: Bartlomiej Zolnierkiewicz commit b66cae7672996c1ed0c4c4a4df04ce7b275c61f6 Author: Sam Ravnborg Date: Tue Feb 26 21:50:33 2008 +0100 hpt366: fix section mismatch warnings hpt366: fix section mismatch warnings Fix following warnings: WARNING: o-sparc64/vmlinux.o(.data+0x195a38): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt370 WARNING: o-sparc64/vmlinux.o(.data+0x195a40): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt370a WARNING: o-sparc64/vmlinux.o(.data+0x195a48): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt372 WARNING: o-sparc64/vmlinux.o(.data+0x195a50): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt372n Replace a static array with a small switch resulting in more readable code. Mark the pci table __devinitconst. A lot of variables are const but annotated __devinitdata. Annotating them __devinitconst would cause a section type conflict error when build for 64 bit powerpc. Signed-off-by: Sam Ravnborg Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit acbe44e6274e88a14a68df511d87890846a9bc99 Author: Borislav Petkov Date: Tue Feb 26 21:50:32 2008 +0100 ide-cd: Enable audio play quirk for Optiarc DVD RW AD-5200A drive Reported-by: Stefan Bader Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 Merge: adefe11... ef8ece5... Author: Linus Torvalds Date: Tue Feb 26 07:55:29 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac Remove empty file fs/xfs/Makefile-linux-2.6. commit adefe11c5383face09068176af7dd4e3a80d8f6b Merge: 3d6ce33... 5606bf5... Author: Linus Torvalds Date: Tue Feb 26 07:50:16 2008 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: add missing ext4_journal_stop() ext4: ext4_find_next_zero_bit needs an aligned address on some arch ext4: set EXT4_EXTENTS_FL only for directory and regular files ext4: Don't mark filesystem error if fallocate fails ext4: Fix BUG when writing to an unitialized extent ext4: Don't use ext4_dec_count() if not needed ext4: modify block allocation algorithm for the last group ext4: Don't claim block from group which has corrupt bitmap ext4: Get journal write access before modifying the extent tree ext4: Fix memory and buffer head leak in callers to ext4_ext_find_extent() ext4: Don't leave behind a half-created inode if ext4_mkdir() fails ext4: Fix kernel BUG at fs/ext4/mballoc.c:910! ext4: Fix locking hierarchy violation in ext4_fallocate() Remove incorrect BKL comments in ext4 commit 3d6ce332537ad0a6f77caa469e09d7335187767b Merge: 3fca96e... 72ad6ec... Author: Linus Torvalds Date: Tue Feb 26 07:49:36 2008 -0800 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: Revert "power_state: get rid of write-only variable in SATA" make atapi_dmadir static commit 3fca96eed1cc9fb524aec536bba8ae921563f1bb Merge: 98c1fc9... 1481197... Author: Linus Torvalds Date: Tue Feb 26 07:49:15 2008 -0800 Merge branch 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep * 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep: Subject: lockdep: include all lock classes in all_lock_classes lockdep: increase MAX_LOCK_DEPTH commit 98c1fc934c097d84dc30c639e9bdb0b992ef53e2 Merge: 7c811e4... fae6031... Author: Linus Torvalds Date: Tue Feb 26 07:48:27 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fix NULL pointer deref. and resource leak Documentation: correction to debugging-via-ohci1394 ieee1394: sbp2: fix rescan-scsi-bus firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device firewire: fw-sbp2: fix NULL pointer deref. in slave_alloc firewire: fw-sbp2: (try to) avoid I/O errors during reconnect firewire: fw-sbp2: enforce a retry of __scsi_add_device if bus generation changed firewire: fw-sbp2: sort includes firewire: fw-sbp2: logout and login after failed reconnect firewire: fw-sbp2: don't add scsi_device twice firewire: fw-sbp2: log bus_id at management request failures firewire: fw-sbp2: wait for completion of fetch agent reset ieee1394: sbp2: add INQUIRY delay workaround firewire: fw-sbp2: add INQUIRY delay workaround firewire: log GUID of new devices firewire: fw-sbp2: don't retry login or reconnect after unplug firewire: fix "kobject_add failed for fw* with -EEXIST" firewire: fw-sbp2: fix logout before login retry firewire: fw-sbp2: unsigned int vs. unsigned commit 7c811e4b6af424c295e3c6438fdc9b647fe6595f Merge: 37c00b8... f18edc9... Author: Linus Torvalds Date: Tue Feb 26 07:44:09 2008 -0800 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: (24 commits) x86: no robust/pi futex for real i386 CPUs x86: fix boot failure on 486 due to TSC breakage x86: fix build on non-C locales. x86: make c_idle.work have a static address. x86: don't save unreliable stack trace entries x86: don't make swapper_pg_pmd global x86: don't print a warning when MTRR are blank and running in KVM x86: fix execve with -fstack-protect x86: fix vsyscall wreckage x86: rename KERNEL_TEXT_SIZE => KERNEL_IMAGE_SIZE x86: fix spontaneous reboot with allyesconfig bzImage x86: remove double-checking empty zero pages debug x86: notsc is ignored on common configurations x86/mtrr: fix kernel-doc missing notation x86: handle BIOSes which terminate e820 with CF=1 and no SMAP x86: add comments for NOPs x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC x86: require family >= 6 if we are using P6 NOPs x86: do not promote TM3x00/TM5x00 to i686-class x86: hpet fix docbook comment ... commit 37c00b84d0c1b5c4c65ae837e2235160c03e84c2 Merge: cf3680b... 13d77c3... Author: Linus Torvalds Date: Tue Feb 26 07:43:31 2008 -0800 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: latencytop: change /proc task_struct access method latencytop: fix memory leak on latency proc file latencytop: fix kernel panic while reading latency proc file sched: add declaration of sched_tail to sched.h sched: fix signedness warnings in sched.c sched: clean up __pick_last_entity() a bit sched: remove duplicate code from sched_fair.c sched: make early bootup sched_clock() use safer commit cf3680b90c7842cf91ed857ac4528f4e057da366 Author: Tejun Heo Date: Thu Feb 14 10:32:07 2008 +0900 printk: fix possible printk overrun printk recursion detection prepends message to printk_buf and offsets printk_buf when actual message is printed but it forgets to trim buffer length accordingly. This can result in overrun in extreme cases. Fix it. [ mingo@elte.hu: bug was introduced by me via: commit 32a76006683f7b28ae3cc491da37716e002f198e Author: Ingo Molnar Date: Fri Jan 25 21:07:58 2008 +0100 printk: make printk more robust by not allowing recursion ] Signed-off-by: Tejun Heo Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit f18edc95a37a901ffcbe91f5e05105f916a04fae Author: Thomas Gleixner Date: Sat Feb 16 14:05:01 2008 +0100 x86: no robust/pi futex for real i386 CPUs Real i386 CPUs do not have cmpxchg instructions. Catch it before crashing on an invalid opcode. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 12c247a6719987aad65f83158d2bb3e73c75c1f5 Author: Mikael Pettersson Date: Sun Feb 24 18:27:03 2008 +0100 x86: fix boot failure on 486 due to TSC breakage > Diffing dmesg between git7 and git8 doesn't sched any light since > git8 also removed the printouts of the x86 caps as they were being > initialised and updated. I'm currently adding those printouts back > in the hope of seeing where and when the caps get broken. That turned out to be very illuminating: --- dmesg-2.6.24-git7 2008-02-24 18:01:25.295851000 +0100 +++ dmesg-2.6.24-git8 2008-02-24 18:01:25.530358000 +0100 ... CPU: After generic identify, caps: 00000003 00000000 00000000 00000000 00000000 00000000 00000000 00000000 CPU: After all inits, caps: 00000003 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +CPU: After applying cleared_cpu_caps, caps: 00000013 00000000 00000000 00000000 00000000 00000000 00000000 00000000 Notice how the TSC cap bit goes from Off to On. (The first two lines are printout loops from -git7 forward-ported to -git8, the third line is the same printout loop added just after the xor-with-cleared_cpu_caps[] loop.) Here's how the breakage occurs: 1. arch/x86/kernel/tsc_32.c:tsc_init() sees !cpu_has_tsc, so bails and calls setup_clear_cpu_cap(X86_FEATURE_TSC). 2. include/asm-x86/cpufeature.h:setup_clear_cpu_cap(bit) clears the bit in boot_cpu_data and sets it in cleared_cpu_caps 3. arch/x86/kernel/cpu/common.c:identify_cpu() XORs all caps in with cleared_cpu_caps HOWEVER, at this point c->x86_capability correctly has TSC Off, cleared_cpu_caps has TSC On, so the XOR incorrectly sets TSC to On in c->x86_capability, with disastrous results. The real bug is that clearing bits with XOR only works if the bits are known to be 1 prior to the XOR, and that's not true here. A simple fix is to convert the XOR to AND-NOT instead. The following patch does that, and allows my 486 to boot 2.6.25-rc kernels again. [ mingo@elte.hu: fixed a similar bug in setup_64.c as well. ] The breakage was introduced via commit 7d851c8d3db0. Signed-off-by: Mikael Pettersson Signed-off-by: Ingo Molnar commit 03994f01e8b72b3d01fd3d09d1cc7c9f421a727c Author: Priit Laes Date: Sun Feb 24 18:36:05 2008 +0200 x86: fix build on non-C locales. For some locales regex range [a-zA-Z] does not work as it is supposed to. so we have to use [:alnum:] and [:xdigit:] to make it work as intended. [1] http://en.wikipedia.org/wiki/Estonian_alphabet Signed-off-by: Ingo Molnar commit 2b775a27c0d9fdf8078d5b31e1e27411e5bf2a91 Author: Glauber Costa Date: Fri Feb 22 12:09:29 2008 -0300 x86: make c_idle.work have a static address. Currently, c_idle is declared in the stack, and thus, have no static address. Peter Zijlstra points out this simple solution, in which c_idle.work is initializated separatedly. Note that the INIT_WORK macro has a static declaration of a key inside. Signed-off-by: Glauber Costa Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 1650743cdc0db73478f72c57544ce79ea8f3dda6 Author: Vegard Nossum Date: Fri Feb 22 19:23:58 2008 +0100 x86: don't save unreliable stack trace entries Currently, there is no way for print_stack_trace() to determine whether a given stack trace entry was deemed reliable or not, simply because save_stack_trace() does not record this information. (Perhaps needless to say, this makes the saved stack traces A LOT harder to read, and probably with no other benefits, since debugging features that use save_stack_trace() most likely also require frame pointers, etc.) This patch reverts to the old behaviour of only recording the reliable trace entries for saved stack traces. Signed-off-by: Vegard Nossum Acked-by: Arjan van de Ven Signed-off-by: Ingo Molnar commit ed2b7e2b1d1ae201afe8fbd111632074b7b53ed4 Author: Adrian Bunk Date: Fri Feb 22 21:58:37 2008 +0200 x86: don't make swapper_pg_pmd global There doesn't seem to be any reason for swapper_pg_pmd being global. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar commit 4147c8747eace9058c606b35e700060297edaf91 Author: Joerg Roedel Date: Thu Feb 21 15:50:14 2008 +0100 x86: don't print a warning when MTRR are blank and running in KVM Inside a KVM virtual machine the MTRRs are usually blank. This confuses Linux and causes a warning message at boot. This patch removes that warning message when running Linux as a KVM guest. Signed-off-by: Joerg Roedel Signed-off-by: Ingo Molnar commit 5d119b2c9a490e2d647eae134211b32a18a04c7d Author: Ingo Molnar Date: Tue Feb 26 12:55:57 2008 +0100 x86: fix execve with -fstack-protect pointed out by pageexec@freemail.hu: > what happens here is that gcc treats the argument area as owned by the > callee, not the caller and is allowed to do certain tricks. for ssp it > will make a copy of the struct passed by value into the local variable > area and pass *its* address down, and it won't copy it back into the > original instance stored in the argument area. > > so once sys_execve returns, the pt_regs passed by value hasn't at all > changed and its default content will cause a nice double fault (FWIW, > this part took me the longest to debug, being down with cold didn't > help it either ;). To fix this we pass in pt_regs by pointer. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ce28b9864b853803320c3f1d8de1b81aa4120b14 Author: Thomas Gleixner Date: Wed Feb 20 23:57:30 2008 +0100 x86: fix vsyscall wreckage based on a report from Arne Georg Gleditsch about user-space apps misbehaving after toggling /proc/sys/kernel/vsyscall64, a review of the code revealed that the "NOP patching" done there is fundamentally unsafe for a number of reasons: 1) the patching code runs without synchronizing other CPUs 2) it inserts NOPs even if there is no clock source which provides vread 3) when the clock source changes to one without vread we run in exactly the same problem as in #2 4) if nobody toggles the proc entry from 1 to 0 and to 1 again, then the syscall is not patched out as a result it is possible to break user-space via this patching. The only safe thing for now is to remove the patching. This code was broken since v2.6.21. Reported-by: Arne Georg Gleditsch Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit d4afe414189b098d56bcd24280c018aa2ac9a990 Author: Ingo Molnar Date: Thu Feb 21 13:39:30 2008 +0100 x86: rename KERNEL_TEXT_SIZE => KERNEL_IMAGE_SIZE The KERNEL_TEXT_SIZE constant was mis-named, as we not only map the kernel text but data, bss and init sections as well. That name led me on the wrong path with the KERNEL_TEXT_SIZE regression, because i knew how big of _text_ my images have and i knew about the 40 MB "text" limit so i wrongly thought to be on the safe side of the 40 MB limit with my 29 MB of text, while the total image size was slightly above 40 MB. Signed-off-by: Ingo Molnar commit 88f3aec7afd9ae3e6f6d221801996b69aad1e3a4 Author: Ingo Molnar Date: Thu Feb 21 11:04:11 2008 +0100 x86: fix spontaneous reboot with allyesconfig bzImage recently the 64-bit allyesconfig bzImage kernel started spontaneously rebooting during early bootup. after a few fun hours spent with early init debugging, it turns out that we've got this rather annoying limit on the size of the kernel image: #define KERNEL_TEXT_SIZE (40*1024*1024) which limit my vmlinux just happened to pass: text data bss dec hex filename 29703744 4222751 8646224 42572719 2899baf vmlinux 40 MB is 42572719 bytes, so my vmlinux was just 1.5% above this limit :-/ So it happily crashed right in head_64.S, which - as we all know - is the most debuggable code in the whole architecture ;-) So increase the limit to allow an up to 128MB kernel image to be mapped. (should anyone be that crazy or lazy) We have a full 4K of pagetable (level2_kernel_pgt) allocated for these mappings already, so there's no RAM overhead and the limit was rather pointless and arbitrary. Signed-off-by: Ingo Molnar commit 3b57bc461fd5019aef4cfc77d4faf56ebe95449c Author: Yinghai Lu Date: Wed Feb 20 18:53:17 2008 -0800 x86: remove double-checking empty zero pages debug so far no one complained about that. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 7265b6f10deba1cbe071cee646b063bda07ecd68 Author: Pavel Machek Date: Tue Feb 19 11:02:30 2008 +0100 x86: notsc is ignored on common configurations notsc is ignored in 32-bit kernels if CONFIG_X86_TSC is on.. which is bad, fix it. Signed-off-by: Pavel Machek Signed-off-by: Ingo Molnar commit f5106d91f2bf9153d6420f9ebb8114f73f9ce66a Author: Randy Dunlap Date: Mon Feb 18 13:10:44 2008 -0800 x86/mtrr: fix kernel-doc missing notation Fix mtrr kernel-doc warning: Warning(linux-2.6.24-git12//arch/x86/kernel/cpu/mtrr/main.c:677): No description found for parameter 'end_pfn' Signed-off-by: Randy Dunlap Signed-off-by: Ingo Molnar commit 829157be590af1c2555fb74c3c4db3327e3201fc Author: H. Peter Anvin Date: Wed Feb 13 11:16:46 2008 -0800 x86: handle BIOSes which terminate e820 with CF=1 and no SMAP The proper way to terminate the e820 chain is with %ebx == 0 on the last legitimate memory block. However, several BIOSes don't do that and instead return error (CF = 1) when trying to read off the end of the list. For this error return, %eax doesn't necessarily return the SMAP signature -- correctly so, since %ah should contain an error code in this case. To deal with some particularly broken BIOSes, we clear the entire e820 chain if the SMAP signature is missing in the middle, indicating a plain insane e820 implementation. However, we need to make the test for CF = 1 before the SMAP check. This fixes at least one HP laptop (nc6400) for which none of the memory-probing methods (e820, e801, 88) functioned fully according to spec. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 4cd20952d74323df06e438c0c3273b5be89d6bfd Author: H. Peter Anvin Date: Mon Feb 18 23:24:33 2008 -0800 x86: add comments for NOPs Add comments describing the various NOP sequences. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 959b3be64cab9160cd74532a49b89cdd918d38e9 Author: H. Peter Anvin Date: Thu Feb 14 14:56:45 2008 -0800 x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC P6_NOPs are definitely not supported on some VIA CPUs, and possibly (unverified) on AMD K7s. It is also the only thing that prevents a 686 kernel from running on Transmeta TM3x00/5x00 (Crusoe) series. The performance benefit over generic NOPs is very small, so when building for generic consumption, avoid using them. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 7343b3b3a627eb30e24e921f004f659c8ebb91c5 Author: H. Peter Anvin Date: Thu Feb 14 14:52:05 2008 -0800 x86: require family >= 6 if we are using P6 NOPs The P6 family of NOPs are only available on family >= 6 or above, so enforce that in the boot code. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit a7ef94e6889186848573a10c5bdb8271405f44de Author: H. Peter Anvin Date: Thu Feb 14 14:51:00 2008 -0800 x86: do not promote TM3x00/TM5x00 to i686-class We have been promoting Transmeta TM3x00/TM5x00 chips to i686-class based on the notion that they contain all the user-space visible features of an i686-class chip. However, this is not actually true: they lack the EA-taking long NOPs (0F 1F /0). Since this is a userspace-visible incompatibility, downgrade these CPUs to the manufacturer-defined i586 level. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit b02a7f22f39f02fdf5a1380ff700293639db4490 Author: Pavel Machek Date: Tue Feb 5 00:48:13 2008 +0100 x86: hpet fix docbook comment Signed-off-by: Pavel Machek Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 92cb54a37a42a41cfb2ef7f1478bfa4395198258 Author: Ingo Molnar Date: Wed Feb 13 14:37:52 2008 +0100 x86: make DEBUG_PAGEALLOC and CPA more robust Use PF_MEMALLOC to prevent recursive calls in the DBEUG_PAGEALLOC case. This makes the code simpler and more robust against allocation failures. This fixes the following fallback to non-mmconfig: http://lkml.org/lkml/2008/2/20/551 http://bugzilla.kernel.org/show_bug.cgi?id=10083 Also, for DEBUG_PAGEALLOC=n reduce the pool size to one page. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 1ce70c4fac3c3954bd48c035f448793867592bc0 Author: Ahmed S. Darwish Date: Sun Feb 24 17:55:15 2008 +0200 x86/lguest: fix pgdir pmd index calculation Hi all, Beginning from commits close to v2.6.25-rc2, running lguest always oopses the host kernel. Oops is at [1]. Bisection led to the following commit: commit 37cc8d7f963ba2deec29c9b68716944516a3244f x86/early_ioremap: don't assume we're using swapper_pg_dir At the early stages of boot, before the kernel pagetable has been fully initialized, a Xen kernel will still be running off the Xen-provided pagetables rather than swapper_pg_dir[]. Therefore, readback cr3 to determine the base of the pagetable rather than assuming swapper_pg_dir[]. static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) { - pgd_t *pgd = &swapper_pg_dir[pgd_index(addr)]; + /* Don't assume we're using swapper_pg_dir at this point */ + pgd_t *base = __va(read_cr3()); + pgd_t *pgd = &base[pgd_index(addr)]; pud_t *pud = pud_offset(pgd, addr); pmd_t *pmd = pmd_offset(pud, addr); Trying to analyze the problem, it seems on the guest side of lguest, %cr3 has a different value from &swapper_pg-dir (which is AFAIK fine on a pravirt guest): Putting some debugging messages in early_ioremap_pmd: /* Appears 3 times */ [ 0.000000] *************************** [ 0.000000] __va(%cr3) = c0000000, &swapper_pg_dir = c02cc000 [ 0.000000] *************************** After 8 hours of debugging and staring on lguest code, I noticed something strange in paravirt_ops->set_pmd hypercall invocation: static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) { *pmdp = pmdval; lazy_hcall(LHCALL_SET_PMD, __pa(pmdp)&PAGE_MASK, (__pa(pmdp)&(PAGE_SIZE-1))/4, 0); } The first hcall parameter is global pgdir which looks fine. The second parameter is the pmd index in the pgdir which is suspectful. AFAIK, calculating the index of pmd does not need a divisoin over four. Removing the division made lguest work fine again . Patch is at [2]. I am not sure why the division over four existed in the first place. It seems bogus, maybe the Xen patch just made the problem appear ? [2]: The patch: [PATCH] lguest: fix pgdir pmd index cacluation Remove an error in index calculation which leads to removing a not existing shadow page table (leading to a Null dereference). Signed-off-by: Ahmed S. Darwish Signed-off-by: Ingo Molnar commit db342d216ba9e060d8c5501eefc1d0a789c9e711 Author: Tony Breeds Date: Tue Feb 19 08:16:03 2008 +0100 lguest: fix build breakage [ mingo@elte.hu: merged to Rusty's patch ] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit cbc34973709eb41b369c304c075cf2069f847012 Author: Harvey Harrison Date: Wed Feb 13 13:14:35 2008 -0800 lguest: include function prototypes Added a declaration to asm-x86/lguest.h and moved the extern arrays there as well. As an alternative to including asm/lguest.h directly, an include could be put in linux/lguest.h Signed-off-by: Harvey Harrison Cc: "rusty@rustcorp.com.au" Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ef8ece55d9b6825c28a5c1a4bd89b94040cb7b32 Author: Lachlan McIlroy Date: Tue Feb 26 17:00:22 2008 +1100 [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac platform. SGI-PV: 971186 SGI-Modid: xfs-linux-melb:xfs-kern:30559a Signed-off-by: Lachlan McIlroy commit db69c915e67705daac25cad06d816c09be634de0 Author: Lachlan McIlroy Date: Tue Feb 26 17:00:14 2008 +1100 [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac platform. SGI-PV: 974005 SGI-Modid: xfs-linux-melb:xfs-kern:30558a Signed-off-by: Lachlan McIlroy commit 96de1a8f0275bd67f243833e7088baced518f873 Author: Paul Mundt Date: Tue Feb 26 14:52:45 2008 +0900 serial: Move asm-sh/sci.h to linux/serial_sci.h. This header is needed on other architectures as well (namely h8300), which currently fails to build without this in place. Rather than duplicating the port definition completely there, just move this to a common location instead. This should get h8300 working again for 2.6.25, in addition to the changes already pushed by Sato-san in -rc2. Signed-off-by: Paul Mundt commit 8b1d16540c6ae4e62fcff56bd47794951b3ca87a Author: Hideo Saito Date: Tue Feb 26 14:28:48 2008 +0900 sh: Fix up HAS_SR_RB typo in entry-macros. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit 763a495a022ac26afb2940e768e86725c1c7e8c9 Author: Magnus Damm Date: Tue Feb 26 14:14:56 2008 +0900 sh: revert dreamcast pci change Commit e036eaa681a17f71b64f6d9040fe605555623919 broke dreamcast pci, this patch fixes that by reverting the dreamcast specific bits. Signed-off-by: Magnus Damm Acked-by: Adrian McMenamin Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit bd49666974a12f39eb9c74044e0b1753efcd94c4 Author: Adrian McMenamin Date: Sun Feb 24 14:30:23 2008 +0000 maple: fix device detection The maple bus driver that went into the kernel mainline in September 2007 contained some bugs which were revealed by the update of the kobj code for the current release series. Unfortunately those bugs also helped ensure maple devices were properly detected. This patch (against the current git) now ensures that devices are properly detected again. (A previous attempt to fix this by delaying initialisation only partially fixed this - as became apparent when the bus was fully loaded) Signed-off-by: Adrian McMenamin Signed-off-by: Paul Mundt commit b7fd095602468ee501c5bcc3f9ca788cb3834096 Author: Rafael Ignacio Zurita Date: Mon Feb 18 22:32:58 2008 -0300 sh: fix rtc_resources setup for sh770x Fix the RTC resources setup for sh770x. Whit these proper start values RTC driver (drivers/rtc/rtc-sh.c) works. Signed-off-by: Rafael Ignacio Zurita Signed-off-by: Paul Mundt commit 1de83e94e6d4af22614c100b0c69716ab6eaa870 Author: Roel Kluin <12o3l@tiscali.nl> Date: Mon Feb 18 14:09:10 2008 +0100 sh: heartbeat: ioremap is expected to succeed ioremap is expected to succeed Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Paul Mundt commit 4377e605e0b004a8d2049eac6cc89fbe1fdcdbb2 Author: Tobias Klauser Date: Sun Feb 17 15:38:35 2008 +0100 sh: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Paul Mundt commit 24d10f0c37d301e88f6965e3dc0aa684311544e5 Author: Adrian McMenamin Date: Sat Feb 16 23:37:33 2008 +0000 maple: remove unused variable Remove an unused variable from the definition of struct maple_device Signed-off-by: Adrian McMenamin Signed-off-by: Paul Mundt commit 91e229bbad6524aabaac8717b2f559283670c37a Merge: 6e5e934... bfa274e... Author: Lachlan McIlroy Date: Tue Feb 26 14:26:14 2008 +1100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit 65b07ec29354b345ff93914d064c2467aef4c862 Author: Adrian Bunk Date: Thu Feb 21 08:01:18 2008 -0600 RDMA/nes: Fix off-by-one Fix an off-by-one spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 9300c0c06788a409a97d54bbe3360d2f385fc621 Author: Chien Tung Date: Thu Feb 21 07:51:17 2008 -0600 RDMA/nes: Resurrect error path dead code Adrian Bunk pointed out that a Coverity scan found some apparently dead code in nes_verbs.c that really shouldn't have been dead. The function nes_create_cq() was missing the assignment err = 1; just prior to an iteration that conditionally set err = 0 if a PBL was found for a given virtual CQ. I also noticed we should have been returning -EFAULT on a couple related error paths. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit 82d416fffb5e8e39e899be7075dbeeac5fb8f0c2 Author: Bryan Rosenburg Date: Wed Feb 20 17:31:48 2008 -0600 RDMA/cxgb3: Fix shift calc in build_phys_page_list() for 1-entry page lists A single entry (addr 0x10001000, size 0x2000) will get converted to page address 0x10000000 with a page size of 0x4000. The code as it stands doesn't address the single buffer case, but in fact it allows the subsequent single-buffer special case to be eliminated entirely. Because the mask now includes the (page adjusted) starting and ending addresses, the general case works for the single buffer case as well. Signed-off-by: Bryan Rosenburg Acked-by: Steve Wise Signed-off-by: Roland Dreier commit 72ad6ec48989d4b5477128e739b960be11155036 Author: Jeff Garzik Date: Mon Feb 25 17:31:10 2008 -0500 Revert "power_state: get rid of write-only variable in SATA" This reverts commit 559bbe6cbd0d8c68d40076a5f7dc98e3bf5864b2. Michael S. Tsirkin reports that this changes breaks suspend/resume. Signed-off-by: Jeff Garzik commit c5c61bda5ecceaa0f16d326cd2c2147468a4c443 Author: Adrian Bunk Date: Mon Feb 25 02:07:25 2008 +0200 make atapi_dmadir static atapi_dmadir can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 1481197b50114d7212d659d41cb97f31a8934883 Author: Dale Farnsworth Date: Mon Feb 25 23:03:02 2008 +0100 Subject: lockdep: include all lock classes in all_lock_classes Add each lock class to the all_lock_classes list when it is first registered. Previously, lock classes were added to all_lock_classes when the lock class was first used. Since one of the uses of the list is to find unused locks, this didn't work well. Signed-off-by: Dale Farnsworth Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit bdb9441e9c325d50b5ae17f7d3205d65b8ed2e5f Author: Peter Zijlstra Date: Mon Feb 25 23:02:48 2008 +0100 lockdep: increase MAX_LOCK_DEPTH Some code paths exceed the current max lock depth (XFS), so increase this limit a bit. I looked at making this a dynamic allocated array, but we should not advocate insane lock depths, so stay with this as long as it works... Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 5606bf5d0cbfbc3dfa78793a3793c43dd045fb1b Author: Akinobu Mita Date: Mon Feb 25 15:37:42 2008 -0500 ext4: add missing ext4_journal_stop() Add missing ext4_journal_stop() in error handling. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Stephen Tweedie Cc: adilger@clusterfs.com Cc: Andrew Morton Cc: Mingming Cao commit 13d77c37cab2bb906022309e1e7182c327e49916 Author: Hiroshi Shimamoto Date: Wed Feb 20 16:53:29 2008 -0800 latencytop: change /proc task_struct access method Change getting task_struct by get_proc_task() at read or write time, and returns -ESRCH if get_proc_task() returns NULL. This is same behavior as other /proc files. Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar commit d6643d12cb0885d06a1491b16c1476abcbd53d40 Author: Hiroshi Shimamoto Date: Thu Feb 14 10:27:00 2008 -0800 latencytop: fix memory leak on latency proc file At lstats_open(), calling get_proc_task() gets task struct, but it never put. put_task_struct() should be called when releasing. Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar commit ae0027869db7d28563cd783865fab04ffd18419c Author: Hiroshi Shimamoto Date: Thu Feb 14 10:26:24 2008 -0800 latencytop: fix kernel panic while reading latency proc file Reading /proc//latency or /proc//task//latency could cause NULL pointer dereference. In lstats_open(), get_proc_task() can return NULL, in which case the kernel will oops at lstats_show_proc() because m->private is NULL. When get_proc_task() returns NULL, the kernel should return -ENOENT. This can be reproduced by the following script. while : do date bash -c 'ls > ls.$$' & pid=$! cat /proc/$pid/latency & cat /proc/$pid/latency & cat /proc/$pid/latency & cat /proc/$pid/latency done Signed-off-by: Hiroshi Shimamoto Signed-off-by: Ingo Molnar commit 2d07b255c7b8a9723010e5c74778e058dc05162e Author: Harvey Harrison Date: Fri Feb 15 09:56:34 2008 -0800 sched: add declaration of sched_tail to sched.h Avoids sparse warnings: kernel/sched.c:2170:17: warning: symbol 'schedule_tail' was not declared. Should it be static? Avoids the need for an external declaration in arch/um/process.c Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar commit 67ca7bde2e9d3516b5ae0188330ad1059ac03f38 Author: Harvey Harrison Date: Fri Feb 15 09:56:36 2008 -0800 sched: fix signedness warnings in sched.c Unsigned long values are always assigned to switch_count, make it unsigned long. kernel/sched.c:3897:15: warning: incorrect type in assignment (different signedness) kernel/sched.c:3897:15: expected long *switch_count kernel/sched.c:3897:15: got unsigned long * kernel/sched.c:3921:16: warning: incorrect type in assignment (different signedness) kernel/sched.c:3921:16: expected long *switch_count kernel/sched.c:3921:16: got unsigned long * Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar commit 7eee3e677d6e2e9007afcd7d79b0715525aa552e Author: Ingo Molnar Date: Fri Feb 22 10:32:21 2008 +0100 sched: clean up __pick_last_entity() a bit Signed-off-by: Ingo Molnar commit 70eee74b70c1a8485ec5f2bafa13dbc66fab6e02 Author: Balbir Singh Date: Fri Feb 22 13:25:53 2008 +0530 sched: remove duplicate code from sched_fair.c pick_task_entity() duplicates existing code. This functionality can be easily obtained using rb_last(). Avoid code duplication by using rb_last(). Signed-off-by: Balbir Singh Signed-off-by: Ingo Molnar commit 6892b75e60557a48c01d57ba320419a9e2ce9846 Author: Ingo Molnar Date: Wed Feb 13 14:02:36 2008 +0100 sched: make early bootup sched_clock() use safer do not call sched_clock() too early. Not only might rq->idle not be set up - but pure per-cpu data might not be accessible either. this solves an ia64 early bootup hang with CONFIG_PRINTK_TIME=y. Tested-by: Tony Luck Acked-by: Tony Luck Acked-by: David S. Miller Signed-off-by: Ingo Molnar commit 8ef97dd7a8721882732ea8041fc07c80be3882ba Author: Paul Mundt Date: Thu Feb 14 15:30:54 2008 +0900 sh: SH5-103 needs to select CPU_SH5. Without this, it's possible to have CONFIG_SUPERH32=y set on SH5-103 parts, which leads to much build badness. Signed-off-by: Paul Mundt commit cc645a020510cf68332a71394a32c1eacb92c6ed Author: Paul Mundt Date: Thu Feb 14 15:09:27 2008 +0900 sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash. drivers/char/pcmcia/synclink_cs.c:284:1: warning: "CCR3" redefined In file included from include/asm/cache.h:13, from include/asm/processor_32.h:15, from include/asm/processor.h:60, from include/linux/prefetch.h:14, from include/linux/list.h:8, from include/linux/module.h:9, from drivers/char/pcmcia/synclink_cs.c:38: include/asm/cpu/cache.h:38:1: warning: this is the location of the previous definition Signed-off-by: Paul Mundt commit 56f5de8fe7c127f6fb94b7a061d53090fd4a1c49 Author: Sonic Zhang Date: Mon Feb 25 15:19:09 2008 +0800 Blackfin Serial Driver: Fix bug - update tx dma buffer tail before wake up processes. Also make rx dma buffer work as a loop. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 0711d857605ba598cd6d4254462d1419b233321b Author: Sonic Zhang Date: Mon Feb 25 15:16:50 2008 +0800 Blackfin Serial Driver: Fix bug - Increase buffer tail immediately before starting tx dma. http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=2920 Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 896aef430e5afb56b5f7b1d959226b8a6a08108a Author: Sam Ravnborg Date: Sun Feb 24 19:49:52 2008 -0800 [SPARC64]: Fix section mismatch from kernel_map_range Fix following warnings: WARNING: vmlinux.o(.text+0x4f980): Section mismatch in reference from the function kernel_map_range() to the function .init.text:__alloc_bootmem() WARNING: vmlinux.o(.text+0x4f9cc): Section mismatch in reference from the function kernel_map_range() to the function .init.text:__alloc_bootmem() alloc_bootmem() is only used during early init and for any subsequent call to kernel_map_range() the program logic avoid the call. So annotate kernel_map_range() with __ref to tell modpost to ignore the reference to a __init function. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 7769bd1c65e3dc22391d60420fea0c859e39b716 Author: Sam Ravnborg Date: Sun Feb 24 19:47:51 2008 -0800 [SPARC64]: Fix section mismatchs from dr_cpu_data Fix following warnings: WARNING: vmlinux.o(.text+0x4b258): Section mismatch in reference from the function dr_cpu_data() to the function .devinit.text:mdesc_fill_in_cpu_data() WARNING: vmlinux.o(.text+0x4b290): Section mismatch in reference from the function dr_cpu_data() to the function .cpuinit.text:cpu_up() mdesc_fill_in_cpu_data() is only used during early init and for cpu hotplug so the __cpuinit annotation is the correct choice. We have the call chain: dr_cpu_data() => dr_cpu_configure() => mdesc_fill_in_cpu_data() dr_cpu_data() is used only during early init and for cpu hotplug. So annotating them all __cpuinit solves the section mismatch and should be correct. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b80a71860d0cfaaa9aa0722238cf3b69bb859eee Author: David S. Miller Date: Sun Feb 24 18:45:09 2008 -0800 [SPARC]: Fix build in arch/sparc/kernel/led.c CC [M] arch/sparc/kernel/led.o arch/sparc/kernel/led.c: In function 'led_blink': arch/sparc/kernel/led.c:35: error: invalid use of undefined type 'struct timer_list' arch/sparc/kernel/led.c:35: error: 'jiffies' undeclared (first use in this function) arch/sparc/kernel/led.c:35: error: (Each undeclared identifier is reported only once arch/sparc/kernel/led.c:35: error: for each function it appears in.) arch/sparc/kernel/led.c:36: error: 'avenrun' undeclared (first use in this function) arch/sparc/kernel/led.c:36: error: 'FSHIFT' undeclared (first use in this function) arch/sparc/kernel/led.c:36: error: 'HZ' undeclared (first use in this function) arch/sparc/kernel/led.c:37: error: invalid use of undefined type 'struct timer_list' arch/sparc/kernel/led.c:39: error: invalid use of undefined type 'struct timer_list' arch/sparc/kernel/led.c:40: error: invalid use of undefined type 'struct timer_list' arch/sparc/kernel/led.c:42: error: implicit declaration of function 'add_timer' arch/sparc/kernel/led.c: In function 'led_write_proc': arch/sparc/kernel/led.c:70: error: implicit declaration of function 'copy_from_user' arch/sparc/kernel/led.c:84: error: implicit declaration of function 'del_timer_sync' arch/sparc/kernel/led.c: In function 'led_init': arch/sparc/kernel/led.c:109: error: implicit declaration of function 'init_timer' arch/sparc/kernel/led.c:110: error: invalid use of undefined type 'struct timer_list' make[1]: *** [arch/sparc/kernel/led.o] Error 1 Based upon original patch by Robert Reif. Signed-off-by: David S. Miller commit 5f2f40a92e007ec5b503db20f3f70cb331c64f65 Author: Harvey Harrison Date: Sun Feb 24 18:38:31 2008 -0800 tipc: fix integer as NULL pointer sparse warnings in tipc net/tipc/cluster.c:145:2: warning: Using plain integer as NULL pointer net/tipc/link.c:3254:36: warning: Using plain integer as NULL pointer net/tipc/ref.c:151:15: warning: Using plain integer as NULL pointer net/tipc/zone.c:85:2: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 323dbaba2cfab170c656f5d68986ff0ced5b421c Merge: bfa274e... 3bf319a... Author: David S. Miller Date: Sun Feb 24 17:57:16 2008 -0800 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 Author: Auke Kok Date: Thu Feb 21 15:11:13 2008 -0800 e1000e: remove unused read value in ASPM disable code. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 489815ce224e75c2fcd5ebdfaa740d7f9a4f20d3 Author: Auke Kok Date: Thu Feb 21 15:11:07 2008 -0800 e1000e: fix spelling errors in comments Fix some spelling errors and inconsistencies in comment blocks. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit de92d84ec2305c490aa1db33f6e40680f8c236a8 Author: Jesse Brandeburg Date: Thu Feb 21 15:11:02 2008 -0800 e1000e: fix flow control denial of service possibility this patch avoids a denial of service from an evildoer sending a continuous stream of flow control at our adapter that is plugged into a non-flow control enabled switch. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 4a5694e66428607585c9f4dd14bcf4158d2de191 Author: Jesse Brandeburg Date: Thu Feb 21 15:10:57 2008 -0800 e1000e: fix flow control when using ethtool overrides Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 03ae221fe9987e22679642b5b687aebbb67bbb47 Author: Jesse Brandeburg Date: Thu Feb 21 15:10:52 2008 -0800 e1000e: fix link up message to show ethX: Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 31f8c4fe5d24376c15e18e2936cfa18cd7e5d917 Author: Auke Kok Date: Thu Feb 21 15:10:47 2008 -0800 e1000e: 82573 can use eerd method to read eeprom This simplifies the 82571/2/3 family initialization a bit and removes an initialization table no longer needed. Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit ac0b3509f048b34ba1b60f164fd811b7cbdbc27a Author: Auke Kok Date: Thu Feb 21 15:10:41 2008 -0800 ixgb: add RNBC counter - no buffer count - to ethtool stats This counter is valuable to determine if the system is unable to timely return buffers to the hardware and this counter starts to increase well before the hardware starts to drop packets. If users experience rx_no_buffer_count increasing, they should increase the amount of descriptors. That will provide more buffers for the hardware and will decrease the chance of hard drops. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 179956f498bd8cc55fb803c4ee0cf18be59c8b01 Author: Atsushi Nemoto Date: Thu Feb 21 22:50:54 2008 +0900 macb: Fix speed setting Fix NCFGR.SPD setting on 10Mbps. This bug was introduced by conversion to generic PHY layer in kernel 2.6.23. Signed-off-by: Atsushi Nemoto Signed-off-by: Jeff Garzik commit a84d0a3d6909c871bfa617a45a7517ce9292d4fb Author: Stephen Hemminger Date: Fri Feb 22 16:00:33 2008 -0800 sky2: fix LED management Fix problems in LED management, so ethtool -p works correctly on Yukon-EC and other chips. The driver was incorrectly setting the PHY LED overide bits. Moral: read the spec sheet, not the vendor driver. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f11cf25ef345a320b152aa68a014c8a65cf4ed44 Author: Laura Garcia Date: Sat Feb 23 18:56:35 2008 +0100 [netdrvr] via-rhine: Use register offset definition for WOLcgClr Use register offset definition for WOLcgClr, rather than a magic number. This patch does not change the driver behaviour. Signed-off-by: Laura Garcia Liebana Signed-off-by: Jeff Garzik commit d1e7fe4d92742dd1aa28ca11512628adc79a904b Author: Adrian Bunk Date: Wed Feb 20 02:13:53 2008 +0200 net/phy/mdio_bus.c: fix a check-after-use This patch fixes a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 68707acb5b5d4e2b7583cbff0883516afed54d4f Author: Bill Hayes Date: Tue Feb 19 10:24:41 2008 -0800 igb: Fix panic with NICs with 1000BASE-SX PHY This patch eliminates a kernel panic with the igb driver in 2.6.25-rc2 when running on a Intel 82575 Ethernet controller with a 1000BASE-SX PHY. The panic does not happen with the 1000BASE-T PHY, only with a SX connection. Signed-off-by: Bill Hayes Signed-off-by: Andy Gospodarek Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit cf7822983f21617b805712eec46eb31058508d6a Author: Becky Bruce Date: Mon Feb 18 17:24:30 2008 -0600 gianfar: don't pass NULL dev ptr to DMA ops Change all dma op invocations in gianfar.c to actually pass in the device pointer. Currently, the value is ignored, but it will be used going forward as we implement archdata for 32-bit powerpc. Signed-off-by: Becky Bruce Acked-by: Andy Fleming Signed-off-by: Jeff Garzik commit 563e0ae06ff18f0b280f11cf706ba0172255ce52 Author: Francois Romieu Date: Mon Feb 18 21:20:32 2008 +0100 sis190: read the mac address from the eeprom first Reading a serie of zero from the cmos sram area do not work well with is_valid_ether_addr(). Let's read the mac address from the eeprom first as it seems more reliable. Fix for http://bugzilla.kernel.org/show_bug.cgi?id=9831 Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 98e0f521456943801aacc7a4c0efb5b3bb6f89e0 Author: Harvey Harrison Date: Mon Feb 18 10:04:38 2008 -0800 tlan: add static to function definitions The forward declarations were already marked static, make the definitions be static as well. Fixes the sparse warnings as well. drivers/net/tlan.c:1403:5: warning: symbol 'TLan_HandleInvalid' was not declared. Should it be static? drivers/net/tlan.c:1435:5: warning: symbol 'TLan_HandleTxEOF' was not declared. Should it be static? drivers/net/tlan.c:1521:5: warning: symbol 'TLan_HandleStatOverflow' was not declared. Should it be static? drivers/net/tlan.c:1557:5: warning: symbol 'TLan_HandleRxEOF' was not declared. Should it be static? drivers/net/tlan.c:1692:5: warning: symbol 'TLan_HandleDummy' was not declared. Should it be static? drivers/net/tlan.c:1722:5: warning: symbol 'TLan_HandleTxEOC' was not declared. Should it be static? drivers/net/tlan.c:1770:5: warning: symbol 'TLan_HandleStatusCheck' was not declared. Should it be static? drivers/net/tlan.c:1845:5: warning: symbol 'TLan_HandleRxEOC' was not declared. Should it be static? drivers/net/tlan.c:1905:6: warning: symbol 'TLan_Timer' was not declared. Should it be static? drivers/net/tlan.c:1986:6: warning: symbol 'TLan_ResetLists' was not declared. Should it be static? drivers/net/tlan.c:2046:6: warning: symbol 'TLan_FreeLists' was not declared. Should it be static? drivers/net/tlan.c:2095:6: warning: symbol 'TLan_PrintDio' was not declared. Should it be static? drivers/net/tlan.c:2130:6: warning: symbol 'TLan_PrintList' was not declared. Should it be static? drivers/net/tlan.c:2166:6: warning: symbol 'TLan_ReadAndClearStats' was not declared. Should it be static? drivers/net/tlan.c:2242:1: warning: symbol 'TLan_ResetAdapter' was not declared. Should it be static? drivers/net/tlan.c:2328:1: warning: symbol 'TLan_FinishReset' was not declared. Should it be static? drivers/net/tlan.c:2451:6: warning: symbol 'TLan_SetMac' was not declared. Should it be static? drivers/net/tlan.c:2493:6: warning: symbol 'TLan_PhyPrint' was not declared. Should it be static? drivers/net/tlan.c:2542:6: warning: symbol 'TLan_PhyDetect' was not declared. Should it be static? drivers/net/tlan.c:2589:6: warning: symbol 'TLan_PhyPowerDown' was not declared. Should it be static? drivers/net/tlan.c:2614:6: warning: symbol 'TLan_PhyPowerUp' was not declared. Should it be static? drivers/net/tlan.c:2635:6: warning: symbol 'TLan_PhyReset' was not declared. Should it be static? drivers/net/tlan.c:2663:6: warning: symbol 'TLan_PhyStartLink' was not declared. Should it be static? drivers/net/tlan.c:2750:6: warning: symbol 'TLan_PhyFinishAutoNeg' was not declared. Should it be static? drivers/net/tlan.c:2906:5: warning: symbol 'TLan_MiiReadReg' was not declared. Should it be static? drivers/net/tlan.c:2996:6: warning: symbol 'TLan_MiiSendData' was not declared. Should it be static? drivers/net/tlan.c:3038:6: warning: symbol 'TLan_MiiSync' was not declared. Should it be static? drivers/net/tlan.c:3077:6: warning: symbol 'TLan_MiiWriteReg' was not declared. Should it be static? drivers/net/tlan.c:3147:6: warning: symbol 'TLan_EeSendStart' was not declared. Should it be static? drivers/net/tlan.c:3187:5: warning: symbol 'TLan_EeSendByte' was not declared. Should it be static? drivers/net/tlan.c:3248:6: warning: symbol 'TLan_EeReceiveByte' was not declared. Should it be static? drivers/net/tlan.c:3306:5: warning: symbol 'TLan_EeReadByte' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit f5154fbf4902744cdd2bb7548487ceaac9840fd2 Author: Julia Lawall Date: Mon Feb 18 14:41:55 2008 +0100 claw: make use of DIV_ROUND_UP The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) / (d)) but is perhaps more readable. Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit 61da96be07ec860e260ca4af0199b9d48d000b80 Author: Komuro Date: Mon Feb 18 22:06:19 2008 +0900 pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message. * If ConfigBase is 0x03c0 && manfid is (0x0149,0xc1ab), printk "use axnet_cs instead" message. Actually, most of the card with manfid(0x0149, 0xc1ab) use pcnet_cs driver. * remove entry (0x021b, 0x0202) Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit a80763c9090fe03a1af98f0106b2aaa4ad6502f9 Author: Leonardo Potenza Date: Sun Feb 17 18:23:15 2008 +0100 drivers/net/cs89x0.c: compilation warning fix Suppress the warning message about the 'netcard_portlist' defined but not used. Signed-off-by: Leonardo Potenza Signed-off-by: Jeff Garzik commit d9d5dcc88ca5c72237e2d09d23a13a9b9d1e7445 Author: Christian Borntraeger Date: Mon Feb 18 10:02:51 2008 +0100 virtio_net: Fix oops on early interrupts - introduced by virtio reset code Signed-off-by: Jeff Garzik commit 7a7d23dac29825a75e375800573d53e49d864a42 Author: Grant Grundler Date: Sun Feb 17 11:30:23 2008 -0700 uli526x partially recognizing interface Patch fixes: http://bugzilla.kernel.org/show_bug.cgi?id=5839 Init sequence needs to poll phy until phy reset is complete. This is the same problem that I fixed in 2002 in tulip driver. Thanks to manty@manty.net for testing this patch. Thanks to Pozsar Balazs for posting/testing a similar patch before: http://lkml.org/lkml/2006/8/21/45 Signed-off-by: Grant Grundler Signed-off-by: Jeff Garzik commit 740db6d7f5bf194abf327613a5a500e3729fc19a Author: Grant Grundler Date: Sun Feb 17 11:53:49 2008 -0700 update TULIP MAINTAINERS Kyle and I are co-maintaining tulip driver. Normally kyle will review my patchs and submit them. I'll deal with bugzilla.kernel.org bugs and try to resolve those bugs. Signed-off-by: Grant Grundler Signed-off-by: Jeff Garzik commit 6cb5e57701d355737f0bc9f94c0f80ed69a95b62 Author: Andy Gospodarek Date: Fri Feb 15 14:05:25 2008 -0800 igb: fix legacy mode irq issue I booted an igb kernel with the option pci=nomsi and instantly noticed that interrupts no longer worked on my igb device. I took a look at the interrupt initialization and quickly discovered a comment stating: "DO NOT USE EIAME or IAME in legacy mode" It seemed a bit odd that bits to enable IAM were being set in legacy interrupt mode, so I dropped out the following parts and interrupts began working fine again. [Updated code flow and a nitpick spelling error --Auke] Signed-off-by: Andy Gospodarek Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df Author: Scott Wood Date: Fri Feb 15 15:08:04 2008 -0600 fs_enet: Don't call phy_mii_ioctl() in atomic context. The lock acquisition in fs_ioctl() does not appear to actually be necessary, and thus is simply removed. Signed-off-by: Scott Wood Signed-off-by: Jeff Garzik commit 21eee2dd1b5702f15924f18f923b2a281f0e72e8 Author: Thomas Klein Date: Wed Feb 13 16:18:33 2008 +0100 ehea: add kdump support This patch adds kdump support to the ehea driver. As the firmware doesn't free resource handles automatically, the driver has to run an as simple as possible free resource function in case of a crash shutdown. The function iterates over two arrays freeing all resource handles which are stored there. The arrays are kept up-to-date during normal runtime. The crash handler fn is triggered by the recently introduced PPC crash shutdown reg/unreg functions. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 8d3c202be23c5a915f7053ebd4e96f44700c6a62 Merge: 1b04ab4... 038eb0e... Author: David S. Miller Date: Sat Feb 23 20:38:20 2008 -0800 Merge branch 'master' of ../linux-2.6/ commit ffad0a44b7216d0f079dcf95a351082099d1e5fb Author: Aneesh Kumar K.V Date: Sat Feb 23 01:38:34 2008 -0500 ext4: ext4_find_next_zero_bit needs an aligned address on some arch ext4_find_next_zero_bit and ext4_find_next_bit needs a long aligned address on x8_64. Add mb_find_next_zero_bit and mb_find_next_bit and use them in the mballoc. Fix: https://bugzilla.redhat.com/show_bug.cgi?id=433286 Eric Sandeen debugged the problem and suggested the fix. Signed-off-by: Aneesh Kumar K.V Acked-by: Eric Sandeen Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 42bf0383d1e09dd1b38f3debb13a76b2f87634b3 Author: Aneesh Kumar K.V Date: Mon Feb 25 16:38:03 2008 -0500 ext4: set EXT4_EXTENTS_FL only for directory and regular files In addition, don't inherit EXT4_EXTENTS_FL from parent directory. If we have a directory with extent flag set and later mount the file system with -o noextents, the files created in that directory will also have extent flag set but we would not have called ext4_ext_tree_init for them. This will cause error later when we are verifying the extent header Signed-off-by: Aneesh Kumar K.V Acked-off-by: Eric Sandeen Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 2c98615d3b64ce7888cd46cc668023f456daf287 Author: Aneesh Kumar K.V Date: Mon Feb 25 15:41:35 2008 -0500 ext4: Don't mark filesystem error if fallocate fails If we fail to allocate blocks don't call ext4_error. Also don't hide errors from ext4_get_blocks_wrap Signed-off-by: Aneesh Kumar K.V Signed-off-by: "Theodore Ts'o" commit f5ab0d1f8f7df937778c60c3da6f4ef939a54a7b Author: Mingming Cao Date: Mon Feb 25 15:29:55 2008 -0500 ext4: Fix BUG when writing to an unitialized extent This patch fixes a bug when writing to preallocated but uninitialized blocks, which resulted in a BUG in fs/buffer.c saying that the buffer is not mapped. When writing to a file, ext4_get_block_wrap() is called with create=1 in order to request that blocks be allocated if necessary. It currently calls ext4_get_blocks() with create=0 in order to do a lookup first. If the inode contains an unitialized data block, the buffer head is left unampped, which ext4_get_blocks_wrap() returns, causing the BUG. We fix this by checking to see if the buffer head is unmapped, and if so, we make sure the the buffer head is mapped by calling ext4_ext_get_blocks with create=1. Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 6e5e93424dc66542c548dfaa3bfebe30d46d50dd Author: Lachlan McIlroy Date: Fri Feb 22 15:36:19 2008 +1100 Remove empty file fs/xfs/Makefile-linux-2.6. commit fae603121428ba83b7343c88e68a7144525ab3eb Author: Stefan Richter Date: Wed Feb 20 21:10:06 2008 +0100 firewire: fix NULL pointer deref. and resource leak By supplying ioctl()s in the wrong order, a userspace client was able to trigger NULL pointer dereferences. Furthermore, by calling ioctl_create_iso_context more than once, new contexts could be created without ever freeing the previously created contexts. Thanks to Anders Blomdell for the report. Signed-off-by: Stefan Richter commit 09d7328e62e3b4cefe4bf3eeeeacb54f62a7ae5c Author: Stefan Richter Date: Mon Feb 18 21:38:35 2008 +0100 Documentation: correction to debugging-via-ohci1394 Rectify a factoid about firewire-ohci. Acked-by: Ingo Molnar Also fix a typo spotted by Bernhard Kaindl. Signed-off-by: Stefan Richter commit ef774c16a744f130f27c654bf9c4806e767fc773 Author: Stefan Richter Date: Sun Feb 17 14:57:10 2008 +0100 ieee1394: sbp2: fix rescan-scsi-bus rescan-scsi-bus used to add SBP-2 targets which weren't there. Signed-off-by: Stefan Richter commit 33f1c6c3529f5f279e2e98e5cca0c5bac152153b Author: Stefan Richter Date: Tue Feb 19 09:05:49 2008 +0100 firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device Fix a kernel bug when unplugging an SBP-2 device after having its scsi_device already removed via the "delete" sysfs attribute. Signed-off-by: Stefan Richter commit 5513c5f6f9bd8c8ad3727130910fa288c62526a7 Author: Stefan Richter Date: Sun Feb 17 14:56:19 2008 +0100 firewire: fw-sbp2: fix NULL pointer deref. in slave_alloc Fix a kernel bug when running rescan-scsi-bus while a FireWire disk is connected: http://bugzilla.kernel.org/show_bug.cgi?id=10008 Signed-off-by: Stefan Richter commit 2e2705bdcb959372d54bf7f79dd9a555ec2adfb4 Author: Stefan Richter Date: Sat Feb 16 16:37:28 2008 +0100 firewire: fw-sbp2: (try to) avoid I/O errors during reconnect While fw-sbp2 takes the necessary time to reconnect to a logical unit after bus reset, the SCSI core keeps sending new commands. They are all immediately completed with host busy status, and application clients or filesystems will break quickly. The SCSI device might even be taken offline: http://bugzilla.kernel.org/show_bug.cgi?id=9734 The only remedy seems to be to block the SCSI device until reconnect. Alas the SCSI core has no useful API to block only one logical unit i.e. the scsi_device, therefore we block the entire Scsi_Host. This currently corresponds to an SBP-2 target. In case of targets with multiple logical units, we need to satisfy the dependencies between logical units by carefully tracking the blocking state of the target and its units. We block all logical units of a target as soon as one of them needs to be blocked, and keep them blocked until all of them are ready to be unblocked. Furthermore, as the history of the old sbp2 driver has shown, the scsi_block_requests() API is a minefield with high potential of deadlocks. We therefore take extra measures to keep logical units unblocked during __scsi_add_device() and during shutdown. This avoids I/O errors during reconnect in many but alas not in all cases. There may still be errors after a re-login had to be performed. Also, some bridges have been seen to cease fetching management ORBs if I/O went on up until a bus reset. In these cases, all management ORBs time out after mgt_orb_timeout. The old sbp2 driver is less vulnerable or maybe not vulnerable to this, for as yet unknown reasons. Signed-off-by: Stefan Richter commit e80de3704ac30ddb7f9a12447a2ecee32ccd7880 Author: Stefan Richter Date: Fri Feb 15 21:29:02 2008 +0100 firewire: fw-sbp2: enforce a retry of __scsi_add_device if bus generation changed fw-sbp2 is unable to reconnect while performing __scsi_add_device because there is only a single workqueue thread context available for both at the moment. This should be fixed eventually. An actual failure of __scsi_add_device is easy to handle, but an incomplete execution of __scsi_add_device with an sdev returned would remain undetected and leave the SBP-2 target unusable. Therefore we use a workaround: If there was a bus reset during __scsi_add_device (i.e. during the SCSI probe), we remove the new sdev immediately, log out, and attempt login and SCSI probe again. Tested-by: Jarod Wilson (earlier version) Signed-off-by: Stefan Richter commit 7bb6bf7c8ba0b4ccfecaa00d6faea51b0bd42c8c Author: Stefan Richter Date: Sun Feb 3 23:12:17 2008 +0100 firewire: fw-sbp2: sort includes Signed-off-by: Stefan Richter commit ce896d95cc7886ae05859c5b409a7b2f3b606ec1 Author: Stefan Richter Date: Sun Feb 3 23:11:39 2008 +0100 firewire: fw-sbp2: logout and login after failed reconnect If fw-sbp2 was too late with requesting the reconnect, the target would reject this. In this case, log out before attempting the reconnect. Else several firmwares will deny the re-login because they somehow didn't invalidate the old login. Also, don't retry reconnects in this situation. The retries won't succeed either. These changes improve chances for successful re-login and shorten the period during which the logical unit is inaccessible. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 0fa6dfdb0a2768541e998a5dab10b368de56c60a Author: Stefan Richter Date: Sun Feb 3 23:10:47 2008 +0100 firewire: fw-sbp2: don't add scsi_device twice When a reconnect failed but re-login succeeded, __scsi_add_device was called again. In those cases, __scsi_add_device succeeded and returned the pointer to the existing scsi_device. fw-sbp2 then continued orderly, except that it missed to call sbp2_cancel_orbs. SCSI core would call fw-sbp2's eh_abort_handler eventually if there had been an outstanding command. This patch avoids the needless lookups and temporary allocations in SCSI core and I/O stall and timeout until eh_abort_handler hits. Also, __scsi_add_device tolerating calls for devices which already exist is undocumented behavior on which we shouldn't rely. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 48f18c761c001a66ef1928b42799c717368b1d64 Author: Stefan Richter Date: Sun Feb 3 23:09:50 2008 +0100 firewire: fw-sbp2: log bus_id at management request failures for easier readable logs if more than one SBP-2 device is present. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit e0e60215552d4d40caf581a8d3247203fe948fe7 Author: Stefan Richter Date: Sun Feb 3 23:08:58 2008 +0100 firewire: fw-sbp2: wait for completion of fetch agent reset Like the old sbp2 driver, wait for the write transaction to the AGENT_RESET to complete before proceeding (after login, after reconnect, or in SCSI error handling). There is one occasion where AGENT_RESET is written to from atomic context when getting DEAD status for a command ORB. There we still continue without waiting for the transaction to complete because this is more difficult to fix... Signed-off-by: Stefan Richter commit d94a983526cb868658c958ab689410dc1c6a31f3 Author: Stefan Richter Date: Sun Feb 3 23:07:44 2008 +0100 ieee1394: sbp2: add INQUIRY delay workaround Add the same workaround as found in fw-sbp2 for feature parity and compatibility of the workarounds module parameter. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 9220f1946209a5b3335ea2d28f8462695885791b Author: Stefan Richter Date: Sun Feb 3 23:04:38 2008 +0100 firewire: fw-sbp2: add INQUIRY delay workaround Several different SBP-2 bridges accept a login early while the IDE device is still powering up. They are therefore unable to respond to SCSI INQUIRY immediately, and the SCSI core has to retry the INQUIRY. One of these retries is typically successful, and all is well. But in case of Momobay FX-3A, the INQUIRY retries tend to fail entirely. This can usually be avoided by waiting a little while after login before letting the SCSI core send the INQUIRY. The old sbp2 driver handles this more gracefully for as yet unknown reasons (perhaps because it waits for fetch agent resets to complete, unlike fw-sbp2 which quickly proceeds after requesting the agent reset). Therefore the workaround is not as much necessary for sbp2. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit fa6e697b85d705d37b3b03829095c22bcbe95ab6 Author: Stefan Richter Date: Sun Feb 3 23:03:00 2008 +0100 firewire: log GUID of new devices This should help to interpret user reports. E.g. one can look up the vendor OUI (first three bytes of the GUID) and thus tell what is what. Also simplifies the math in the GUID sysfs attribute. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit be6f48b0174584c9c415012ca14803c7e941e27e Author: Stefan Richter Date: Sun Jan 27 19:14:44 2008 +0100 firewire: fw-sbp2: don't retry login or reconnect after unplug If a device is being unplugged while fw-sbp2 had a login or reconnect on schedule, it would take about half a minute to shut the fw_unit down: Jan 27 18:34:54 stein firewire_sbp2: logged in to fw2.0 LUN 0000 (0 retries) Jan 27 18:34:59 stein firewire_sbp2: sbp2_scsi_abort Jan 27 18:34:59 stein scsi 25:0:0:0: Device offlined - not ready after error recovery Jan 27 18:35:01 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:06 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:12 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:17 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:22 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:27 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:32 stein firewire_sbp2: orb reply timed out, rcode=0x11 Jan 27 18:35:32 stein firewire_sbp2: failed to login to fw2.0 LUN 0000 Jan 27 18:35:32 stein firewire_sbp2: released fw2.0 After this patch, typically only a few seconds spent in __scsi_add_device remain: Jan 27 19:05:50 stein firewire_sbp2: logged in to fw2.0 LUN 0000 (0 retries) Jan 27 19:05:56 stein firewire_sbp2: sbp2_scsi_abort Jan 27 19:05:56 stein scsi 33:0:0:0: Device offlined - not ready after error recovery Jan 27 19:05:56 stein firewire_sbp2: released fw2.0 The benefit of this is less noise in the syslog. It furthermore avoids a few wasted CPU cycles and needlessly prolonged lifetime of a few driver objects. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 96b19062e741b715cf399312c30e0672d8889569 Author: Stefan Richter Date: Sat Feb 2 15:01:09 2008 +0100 firewire: fix "kobject_add failed for fw* with -EEXIST" There is a race between shutdown and creation of devices: fw-core may attempt to add a device with the same name of an already existing device. http://bugzilla.kernel.org/show_bug.cgi?id=9828 Impact of the bug: Happens rarely (when shutdown of a device coincides with creation of another), forces the user to unplug and replug the new device to get it working. The fix is obvious: Free the minor number *after* instead of *before* device_unregister(). This requires to take an additional reference of the fw_device as long as the IDR tree points to it. And while we are at it, we fix an additional race condition: fw_device_op_open() took its reference of the fw_device a little bit too late, hence was in danger to access an already invalid fw_device. Signed-off-by: Stefan Richter commit 1b9c12ba2fdf802a23630f70eddb0e821296634e Author: Stefan Richter Date: Sat Jan 26 17:43:23 2008 +0100 firewire: fw-sbp2: fix logout before login retry This fixes a "can't recognize device" kind of bug. If the SCSI INQUIRY failed and hence __scsi_add_device failed due to a bus reset, we tried a logout and then waited for the already scheduled login work to happen. So far so good, but the generation used for the logout was outdated, hence the logout never reached the target. The target might therefore deny the subsequent relogin attempt, which would also leave the target inaccessible. Therefore fetch a fresh device->generation for the logout. Use memory barriers to prevent our plan being foiled by compiler or hardware optimizations. Signed-off-by: Stefan Richter commit 05cca7381429e12d66c5b5c8b5c5848055b88bf7 Author: Stefan Richter Date: Sat Jan 26 17:42:45 2008 +0100 firewire: fw-sbp2: unsigned int vs. unsigned Standardize on "unsigned int" style. Sort some struct members thematically. Signed-off-by: Stefan Richter commit 825f1481ead4ce40671089bae7412ac3519e8caa Author: Theodore Ts'o Date: Fri Feb 15 15:00:38 2008 -0500 ext4: Don't use ext4_dec_count() if not needed The ext4_dec_count() function is only needed when dropping the i_nlink count on inodes which are (or which could be) directories. If we *know* that the inode in question can't possibly be a directory, use drop_nlink or clear_nlink() if we know i_nlink is 1. Signed-off-by: "Theodore Ts'o" commit 74d3487fc8aa58cec16dff7239dea1ca59bdab0e Author: Valerie Clement Date: Fri Feb 15 13:43:07 2008 -0500 ext4: modify block allocation algorithm for the last group When a directory inode is allocated in the last group and the last group contains less than s_blocks_per_group blocks, the initial block allocated for the directory is not always allocated in the same group as the directory inode, but in one of the first groups of the filesystem (group 1 for example). Depending on the current process's pid, ext4_find_near() and ext4_ext_find_goal() can return a block number greater than the maximum blocks count in the filesystem and in that case the block will be not allocated in the same group as the inode. The following patch fixes the problem. Should the modification also be done in ext2/3 code? Signed-off-by: Valerie Clement Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit e56eb6590693a5a340e8f596db2768a6e1b9e236 Author: Aneesh Kumar K.V Date: Fri Feb 15 13:48:21 2008 -0500 ext4: Don't claim block from group which has corrupt bitmap In ext4_mb_complex_scan_group, if the extent length of the newly found extentet is greater than than the total free blocks counted in group info, break without claiming the block. Document different ext4_error usage, explaining the state with which we continue if we mount with errors=continue Signed-off-by: Aneesh Kumar K.V Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 9df5643ad135c7f8c02d3b69020de4ec910f9fc0 Author: Aneesh Kumar K.V Date: Fri Feb 22 06:17:31 2008 -0500 ext4: Get journal write access before modifying the extent tree When the user was writing into an unitialized extent, ext4_ext_convert_to_initialize() was not requesting journal write access before it started to modify the extent tree. Fix this oversight. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit b35905c16ad6428551eb9e49525011bd2700cf56 Author: Aneesh Kumar K.V Date: Mon Feb 25 16:54:37 2008 -0500 ext4: Fix memory and buffer head leak in callers to ext4_ext_find_extent() The path variable returned via ext4_ext_find_extent is a kmalloc variable and needs to be freeded. It also contains a reference to buffer_head which needs to be dropped. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 4cdeed861b5f797b3fa661eb331a6bd6ad669c6a Author: Aneesh Kumar K.V Date: Fri Feb 22 06:17:31 2008 -0500 ext4: Don't leave behind a half-created inode if ext4_mkdir() fails If ext4_mkdir() fails to allocate the initial block for the directory, don't leave behind a half-created directory inode with the link count left at one. This was caused by an inappropriate call to ext4_dec_count(). Signed-off-by: Aneesh Kumar K.V Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit b73fce69ecb091a178ef9286027c370a63eb25aa Author: Valerie Clement Date: Fri Feb 15 13:48:51 2008 -0500 ext4: Fix kernel BUG at fs/ext4/mballoc.c:910! With the flex_bg feature enabled, a large file creation oopses the kernel. The BUG_ON is: BUG_ON(len >= EXT4_BLOCKS_PER_GROUP(sb)); As the allocation of the bitmaps and the inode table can be done outside the block group with flex_bg, this allows to allocate up to EXT4_BLOCKS_PER_GROUP blocks in a group. This patch fixes the oops. Signed-off-by: Valerie Clement Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 55bd725aa3a83b3935988f37275b5a80e10d4169 Author: Aneesh Kumar K.V Date: Fri Feb 15 12:47:21 2008 -0500 ext4: Fix locking hierarchy violation in ext4_fallocate() ext4_fallocate() was trying to acquire i_data_sem outside of jbd2_start_transaction/jbd2_journal_stop, which violates ext4's locking hierarchy. So we take i_mutex to prevent writes and truncates during the complete fallocate operation, and use ext4_get_block_wrap() which acquires and releases i_data_sem for each block allocation. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 642be6ec218b956fbae88304449720f76ba0d578 Author: Andi Kleen Date: Mon Feb 25 17:20:46 2008 -0500 Remove incorrect BKL comments in ext4 Signed-off-by: Andi Kleen Signed-off-by: "Theodore Ts'o" commit d45ad06273f797f6239b97fd9962ecd81eec847f Author: Haavard Skinnemoen Date: Fri Feb 15 14:38:40 2008 +0100 avr32: Call tick_nohz_{stop,restart}_sched_tick() in idle loop This fixes a hang on boot with nohz enabled. nohz is not actually supported in mainline yet, but patches that add support for it are currently under review. When nohz is compiled out, the functions are no-ops, so this patch results in no functional change, but it arguably makes the code more correct. Signed-off-by: Haavard Skinnemoen commit f059267e7fa9e3efa1498eb963ba18ec25665c42 Author: Haavard Skinnemoen Date: Wed Feb 13 14:29:30 2008 +0100 avr32: Use correct config symbol in atstk1004 board code CONFIG_BOARD_ATSTK1002_SW2_CUSTOM should be CONFIG_BOARD_ATSTK100X_SW2_CUSTOM. Spotted by Robert P. J. Day. Signed-off-by: Haavard Skinnemoen commit 32019828d9012e584017a824f84798248c0060dd Author: Haavard Skinnemoen Date: Wed Feb 13 12:32:34 2008 +0100 avr32: Fix broken pte dump code in do_page_fault() The per-task page tables only cover the first 2GiB of the address space. For kernel addresses, we need to do the lookup in init's page tables. This is a temporary workaround until we modify the per-task page tables to cover the whole 4GiB address space. Signed-off-by: Haavard Skinnemoen commit e48a411fa097c386c6081f4ed5a952aa3e21ca2b Author: Haavard Skinnemoen Date: Mon Feb 11 16:55:19 2008 +0100 AVR32: Define PAGE_SHARED The virtual framebuffer driver needs PAGE_SHARED, which is not defined on avr32. Define it. Reported-by: Oliver Zander Signed-off-by: Haavard Skinnemoen commit db288381e26e592b11572ce8199bedeadf0c0830 Author: Sonic Zhang Date: Sat Feb 2 17:05:02 2008 +0800 [Blackfin] serial driver: Add flow control support to bf54x Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 4cb4f22b19237e63c460c53fbd1c417cdaf63014 Author: Sonic Zhang Date: Sat Feb 2 14:29:25 2008 +0800 [Blackfin] serial driver: Fix bug Poll RTS/CTS status in DMA mode as well https://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3858 Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 095455682e29dbbc9f93ad83db459df524524992 Author: Michael Hennerich Date: Sat Feb 2 15:58:30 2008 +0800 [Blackfin] serial driver: ADSP-BF52x arch/mach support Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 1ba7a3ee310138015e744444043ce3e947429fce Author: Mike Frysinger Date: Fri Jan 11 15:56:26 2008 +0800 [Blackfin] serial driver: use simpler comment headers and strip out information that is maintained in the scm's log Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 8851c71eb97610f0f63121d62345c969f71201a2 Author: Mike Frysinger Date: Mon Dec 24 19:48:04 2007 +0800 [Blackfin] serial driver: rework break flood anomaly handling to be more robust/realistic about what we can actually work around Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 0bcfd70ea11a5d6f2362be463513a60245a62baf Author: Mike Frysinger Date: Mon Dec 24 19:40:05 2007 +0800 [Blackfin] serial driver: fix bug - cache the bits of the LSR on systems where the LSR is read-to-clear Cache the bits of the LSR on systems where the LSR is read-to-clear so that we can safely read the LSR in random places. this fixes older parts where break/framing/parity/overflow was not being detected at all in PIO mode, and this fixes newer parts where break/framing/parity/overflow was being reported all the time without being cleared. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 4c195ad88b7df54b2e7340dec3446aee6ca84cd1 Author: Sonic Zhang Date: Sun Dec 23 23:18:08 2007 +0800 [Blackfin] serial driver: fix bug - should not wait for the TFI bit, just clear it when tx stop. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 99ee7b5f3a68324807650f650f2613bbe281627f Author: Sonic Zhang Date: Fri Dec 21 17:12:55 2007 +0800 [Blackfin] serial driver: Fix bug serial driver in DMA mode spams history to console on shell restart http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=2920 Fix by increasing buffer tail immediately before starting tx dma. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 75b780bd99b851682289e7a88763ede5a936edb0 Author: Sonic Zhang Date: Fri Dec 21 17:03:39 2007 +0800 [Blackfin] serial driver: Fix bug Free rx dma buffer in shutdown. Kernel crash for the serial driver in DMA mode: http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3679 Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 1b73351c6afcc3acbf9e29a43ee14b3c9a386503 Author: Sonic Zhang Date: Fri Dec 21 16:45:12 2007 +0800 [Blackfin] serial driver: Clean up UART DMA code. Start next TX DMA in tx dma handler instead of rx timer handler. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 759eb040901af60d8a1a2b59b93805521b156cbb Author: Sonic Zhang Date: Wed Nov 21 17:00:32 2007 +0800 Blackfin Serial driver: Fix bug - serial driver in PIO mode cant handle input very quickly Output as many bytes as possible in PIO tx handler. This reduce the number of tx interrupts and shorten the delay to handle rx interrupt. So, rx overrun disappears. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit c051489df8b027238ff22d64d4e01ede3ad77dd5 Author: Bryan Wu Date: Fri Feb 29 12:02:10 2008 +0800 [Blackfin] arch: kill section mismatch warnings Signed-off-by: Bryan Wu commit 8b07a2a1e58beb60c4a40a46251f053d64e1eb36 Author: Mike Frysinger Date: Fri Feb 29 11:57:35 2008 +0800 [Blackfin] arch: handle the most common L1 shrinkage case (L1 does not exist for a part) so that any parts labeled for L1 instead get placed into external memory sections Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 40edad3efadb3aa486c7a5452401c4de10902496 Author: Mike Frysinger Date: Mon Feb 25 15:23:30 2008 +0800 [Blackfin] arch: add bfin_clear_PPIx_STATUS() helper funcs like we have for other parts Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit fee40119a2b2abbe239438b74052854db6f3444d Author: Mike Frysinger Date: Mon Feb 25 15:06:07 2008 +0800 [Blackfin] arch: make sure we have proper description/copyright/license lines Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 3927819d511f5b5855e6f2345f24e7b04e4fd2f5 Author: Michael Hennerich Date: Mon Feb 25 14:39:50 2008 +0800 [Blackfin] arch: Fix CONFIG_PM support for BF561 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 9253d02041c60d732713c40c59b49fbde8f3bc1c Author: Michael Hennerich Date: Mon Feb 25 14:27:28 2008 +0800 [Blackfin] arch: Remove DPMC char driver option Remove redundant/obsolete/dead code from DPMC driver Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 464abc5de6ea8f4af1c1246e0d1ea7b07362db43 Author: Michael Hennerich Date: Mon Feb 25 13:50:20 2008 +0800 [Blackfin] arch: Cleanup abd Simplify: - Simplify init_arch_irq - Make code more readable - Remove useless SSYNCs - Fix comments Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit ce3b7bb61c120e1e4e70e892ec281ef2bb81d6fa Author: Michael Hennerich Date: Mon Feb 25 13:48:47 2008 +0800 [Blackfin] arch: fix bug - linux-2.6.24 (delayed) disable IRQ feature not functional for handle_simple_irq Bypass delayed disable feature by implementing chip->disable and chip->enable. http://lkml.org/lkml/2008/2/19/115 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit d45118b14bf04e124e4d875b136d5c1c4df97d57 Author: Mike Frysinger Date: Mon Feb 25 12:24:44 2008 +0800 [Blackfin] arch: make sure we export the _bfin_swrst symbol as modules (like the watchdog) need it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 0db5d105cd62055ea7a3b7ddf7b7408ba65a07b9 Author: Mike Frysinger Date: Mon Feb 25 12:19:57 2008 +0800 [Blackfin] arch: punt the simple ad5304 spi driver now that the generic spidev driver lets you do it from userspace Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit fe9ec9b9698b95ad21617c1db21eb0d1c040b93d Author: Michael Hennerich Date: Mon Feb 25 12:04:57 2008 +0800 [Blackfin] arch: fix bug - Move IWR Enable All to the end of init_arch_irq otherwise it fails Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 181afa94989f431e93eccd784c14c37ccb395a00 Author: Mike Frysinger Date: Mon Feb 25 11:42:17 2008 +0800 [Blackfin] arch: grab mac address from OTP on BF527-EZKIT The bf527-ezkit stores the mac address in OTP, so grab it from there rather than flash Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 549aaa8425b4a1de23cbddc650dac75b91204af6 Author: Sonic Zhang Date: Mon Feb 25 11:13:07 2008 +0800 [Blackfin] arch: Fix bug - Setting peripheral_map only when dma channel is UART2/3. Singed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit cad2ab65dd1c7d65153ffccd71c90db028fd62f0 Author: Mike Frysinger Date: Fri Feb 22 17:01:31 2008 +0800 [Blackfin] arch: add board resources for new simple-gpio char driver Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit edf056417d11fe9321ec15a55bd128e4f4c73796 Author: Mike Frysinger Date: Mon Feb 25 11:38:11 2008 +0800 [Blackfin] arch: fix bug - set right partition size in the board files - set default u-boot partition size to 256k - modify the offset with the size change - use mtd defines (append for offset and full for size) where applicable rather than churning constants when we dont have to Signed-off-by: Grace Pan Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 32320ea0a63003a249773b5e3e459e66bb5fb8f8 Author: Sonic Zhang Date: Fri Feb 22 16:43:45 2008 +0800 [Blackfin] arch: Update default config Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 8929ecf84df529338d258f0ad9c1e553dfc921bc Author: Mike Frysinger Date: Fri Feb 22 16:35:20 2008 +0800 [Blackfin] arch: add fixed code to the memory map output Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit c63d4e64087aa6633c07964b5f028198c5bee762 Author: Mike Frysinger Date: Fri Feb 22 16:12:01 2008 +0800 [Blackfin] arch: add handling for the mach symlink in the `make V=1` case Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 4d94bf674683b0560720bdea3b0c5d4716e1abec Author: Mike Frysinger Date: Fri Feb 22 16:03:54 2008 +0800 [Blackfin] arch: respect `make -s` when creating the asm/mach symlink Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 7aa475cfb7030f491d040333a343d8c414765f1a Author: Mike Frysinger Date: Fri Feb 22 16:01:50 2008 +0800 [Blackfin] arch: fix bug add missing header file Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 7dd06cdbd37c44a468117b0ffae0b54471268035 Author: Bryan Wu Date: Thu Feb 21 16:18:43 2008 +0800 [MAINTAINERS] use new kernel.org email for kernel development. Signed-off-by: Bryan Wu