39f0722 | Tilman Schmidt | 13 December 2006, 08:33:52 UTC | [PATCH] isdn/gigaset: fix possible missing wakeup Eliminate some possibilities for user processes writing to the Gigaset character device to be left sleeping indefinitely, by adding wakeup calls to error paths and properly disposing of pending write requests when the device is disconnected. It also removes unnecessary NULL checks before usb_free_urb() and usb_kill_urb() calls. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:47 UTC |
eff3b63 | Peter Zijlstra | 13 December 2006, 08:33:50 UTC | [PATCH] uml: fix net_kern workqueue abuse Fix up the work on stack and exit scope trouble by placing the work_struct in the uml_net_private data. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:47 UTC |
ffd22b8 | David Brownell | 13 December 2006, 08:33:49 UTC | [PATCH] another build fix, header rearrangements (OSK) Some of the header file rearrangements broke the build for board-osk. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Russell King <rmk@arm.linux.org.uk> Cc: <tony@atomide.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
8c1bc04 | David Brownell | 13 December 2006, 08:33:46 UTC | [PATCH] fix more workqueue build breakage (tps65010) More fixes to build breakage from the work_struct changes ... this updates the tps65010 driver. Plus, fix some dependencies related to the way it's used on the OMAP OSK: force static linking there, since the resulting kernel can't link. NOTE that until the i2c core gets fixed to work without SMBUS_QUICK, kernels needing this driver must still use "tps65010.force=0,0x48" on the command line. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Jean Delvare <khali@linux-fr.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
05b3e0c | Avi Kivity | 13 December 2006, 08:33:45 UTC | [PATCH] KVM: Replace __x86_64__ with CONFIG_X86_64 As per akpm's request. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
5aff458 | Avi Kivity | 13 December 2006, 08:33:45 UTC | [PATCH] KVM: Clean up AMD SVM debug registers load and unload By letting gcc choose the temporary register for us, we lose arch dependency and some ugliness. Conceivably gcc will also generate marginally better code. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
fd24dc4 | Avi Kivity | 13 December 2006, 08:33:44 UTC | [PATCH] KVM: Put KVM in a new Virtualization menu Instead of in the main drivers menu. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
3b3be0d | Anthony Liguori | 13 December 2006, 08:33:43 UTC | [PATCH] KVM: Add missing include load_TR_desc() lives in asm/desc.h, so #include that file. Signed-off-by: Anthony Liguori <anthony@codemonkey.ws> Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
a311f74 | Heiko Carstens | 13 December 2006, 08:33:41 UTC | [PATCH] tty: export get_current_tty 24ec839c431eb79bb8f6abc00c4e1eb3b8c4d517 causes this: WARNING: "get_current_tty" [drivers/s390/char/fs3270.ko] undefined! Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
24d34dc | Andrew Morton | 13 December 2006, 08:33:40 UTC | [PATCH] arch/i386/kernel/smpboot.c: remove unneeded ifdef #ifdef CONFIG_SMP in a file which isn't compiled in non-SMP kernels. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 13 December 2006, 17:05:46 UTC |
445722f | Linus Torvalds | 13 December 2006, 02:53:48 UTC | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] kprobe clears qp bits for special instructions [IA64] enable trap code on slot 1 [IA64] Take defensive stance on ia64_pal_get_brand_info() [IA64] fix possible XPC deadlock when disconnecting [IA64] - Reduce overhead of FP exception logging messages [IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid' [IA64] s/termios/ktermios/ in simserial.c [IA64] kexec/kdump: tidy up declaration of relocate_new_kernel_t [IA64] Kexec/Kdump: honour non-zero crashkernel offset. [IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0 | 13 December 2006, 02:53:48 UTC |
3641b53 | Linus Torvalds | 13 December 2006, 02:53:04 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] VIA and SiS AGP chipsets are x86-only [AGPGART] agp-amd64: section mismatches with HOTPLUG=n [AGPGART] Fix up misprogrammed bridges with incorrect AGPv2 rates. | 13 December 2006, 02:53:04 UTC |
b1ef951 | Linus Torvalds | 13 December 2006, 02:52:31 UTC | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Make sure struct ipoib_neigh.queue is always initialized IB/iser: Use the new verbs DMA mapping functions IB/srp: Use new verbs IB DMA mapping functions IPoIB: Use the new verbs DMA mapping functions IB/core: Use the new verbs DMA mapping functions IB/ipath: Implement new verbs DMA mapping functions IB: Add DMA mapping functions to allow device drivers to interpose RDMA/cma: Export rdma cm interface to userspace RDMA/cma: Add support for RDMA_PS_UDP RDMA/cma: Allow early transition to RTS to handle lost CM messages RDMA/cma: Report connect info with connect events RDMA/cma: Remove unneeded qp_type parameter from rdma_cm IB/ipath: Fix IRQ for PCI Express HCAs RDMA/amso1100: Fix memory leak in c2_qp_modify() IB/iser: Remove unused "write-only" variables IB/ipath: Remove unused "write-only" variables IB/fmr: ib_flush_fmr_pool() may wait too long | 13 December 2006, 02:52:31 UTC |
775ba7a | Linus Torvalds | 13 December 2006, 02:51:51 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Fix inotify maintainers entry Fix typo in new debug options. Jon needs a new shift key. fs: Convert kmalloc() + memset() to kzalloc() in fs/. configfs.h: Remove dead macro definitions. kconfig: Standardize "depends" -> "depends on" in Kconfig files e100: replace kmalloc with kcalloc um: replace kmalloc+memset with kzalloc fix typo in net/ipv4/ip_fragment.c include/linux/compiler.h: reject gcc 3 < gcc 3.2 Kconfig: fix spelling error in config KALLSYMS help text Remove duplicate "have to" in comment Fix small typo in drivers/serial/icom.c Use consistent casing in help message EXT{2,3,4}_FS: remove outdated part of the help text | 13 December 2006, 02:51:51 UTC |
d940505 | Linus Torvalds | 13 December 2006, 02:51:36 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] pcwd_usb.c generic HID include file [WATCHDOG] watchdog miscdevice patch [WATCHDOG] rm9k_wdt: fix interrupt handler arguments [WATCHDOG] rm9k_wdt: fix compilation | 13 December 2006, 02:51:36 UTC |
f0eef25 | Dave Jones | 12 December 2006, 23:13:32 UTC | Merge ../linus | 12 December 2006, 23:13:32 UTC |
0cfea5d | Matthew Wilcox | 04 December 2006, 10:43:14 UTC | [AGPGART] VIA and SiS AGP chipsets are x86-only There's no point in troubling the Alpha, IA-64, PowerPC and PARISC people with SiS and VIA options. Andrew thinks it helps find bugs, but there's no evidence of that. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 23:10:52 UTC |
0ac633b | Randy Dunlap | 20 November 2006, 02:52:28 UTC | [AGPGART] agp-amd64: section mismatches with HOTPLUG=n When CONFIG_HOTPLUG=n, agp_amd64_resume() calls nforce3_agp_init(), which is __devinit == __init, so has been discarded and is not usable for resume. WARNING: drivers/char/agp/amd64-agp.o - Section mismatch: reference to .init.text: from .text between 'agp_amd64_resume' (at offset 0x249) and 'amd64_tlbflush' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 23:10:52 UTC |
a57bf8a | Wim Van Sebroeck | 12 December 2006, 22:48:41 UTC | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog | 12 December 2006, 22:48:41 UTC |
82b3991 | Roland Dreier | 12 December 2006, 22:48:18 UTC | IPoIB: Make sure struct ipoib_neigh.queue is always initialized Move the initialization of ipoib_neigh's skb_queue into ipoib_neigh_alloc(), since commit 2745b5b7 ("IPoIB: Fix skb leak when freeing neighbour") will make iterate over the skb_queue to free any packets left over when freeing the ipoib_neigh structure. This fixes a crash when freeing ipoib_neigh structures allocated in ipoib_mcast_send(), which otherwise don't have their skb_queue initialized. Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:48:18 UTC |
d4b8759 | Wim Van Sebroeck | 12 December 2006, 22:46:47 UTC | [WATCHDOG] pcwd_usb.c generic HID include file Now that the generic HID layer created include/linux/hid.h we can use the HID_REQ_SET_REPORT and HID_DT_REPORT defines directly from that include file. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> | 12 December 2006, 22:46:47 UTC |
c436688 | Dave Jones | 12 December 2006, 22:41:41 UTC | Merge ../linus Conflicts: drivers/cpufreq/cpufreq.c | 12 December 2006, 22:41:41 UTC |
db2fb9d | Rafa\xb3 Bilski | 30 November 2006, 02:47:41 UTC | [CPUFREQ] Longhaul - Add support for CN400 Support for CN400 northbridge when ACPI C3 isn't available. Tested on Epia SP13000. Thanks to Robert for testing it. Signed-off-by: Rafa\xb3 Bilski <rafalbilski@interia.pl> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:33:10 UTC |
3f4a25f | Rafa\xb3 Bilski | 30 November 2006, 02:36:44 UTC | [CPUFREQ] Longhaul - fix 200MHz FSB On board of Epia SP13000 is 10x133Mhz VIA Nehemiah. It is reported as 10x200MHz. This patch is fixing this issue. Signed-off-by: Rafa\xb3 Bilski <rafalbilski@interia.pl> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:33:10 UTC |
5180311 | Ralph Campbell | 12 December 2006, 22:31:00 UTC | IB/iser: Use the new verbs DMA mapping functions Convert iSER to use the new verbs DMA mapping functions for kernel verbs consumers. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:31:00 UTC |
85507bc | Ralph Campbell | 12 December 2006, 22:30:55 UTC | IB/srp: Use new verbs IB DMA mapping functions Convert SRP to use the new verbs DMA mapping functions for kernel verbs consumers. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:30:55 UTC |
37ccf9d | Ralph Campbell | 12 December 2006, 22:30:48 UTC | IPoIB: Use the new verbs DMA mapping functions Convert IPoIB to use the new DMA mapping functions for kernel verbs consumers. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:30:48 UTC |
e11952b | Dominik Brodowski | 05 December 2006, 01:39:16 UTC | [CPUFREQ] p4-clockmod: fix support for Core Support for Core CPUs was broken in two ways in speedstep-lib: for x86_64, we missed a MSR definition; for both x86_64 and i386, the FSB calculation was wrong by four (it's a quad-pumped bus). Also increase the accuracy of the calculation. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:29:04 UTC |
1527106 | Ralph Campbell | 12 December 2006, 22:28:30 UTC | IB/core: Use the new verbs DMA mapping functions Convert code in core/ to use the new DMA mapping functions for kernel verbs consumers. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:28:30 UTC |
f2cbb66 | Ralph Campbell | 12 December 2006, 22:28:28 UTC | IB/ipath: Implement new verbs DMA mapping functions This patch implements the interposing DMA mapping functions to allow support for IOMMUs and remove the dependence on phys_to_virt() and bus_to_virt(). Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:28:28 UTC |
9b51309 | Ralph Campbell | 12 December 2006, 22:27:41 UTC | IB: Add DMA mapping functions to allow device drivers to interpose The QLogic InfiniPath HCAs use programmed I/O instead of HW DMA. This patch allows a verbs device driver to interpose on DMA mapping function calls in order to avoid relying on bus_to_virt() and phys_to_virt() to undo the mappings created by dma_map_single(), dma_map_sg(), etc. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 22:27:41 UTC |
7531a0b | Dave Jones | 12 December 2006, 22:26:35 UTC | [CPUFREQ] Fix git URL. Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:26:35 UTC |
3d4a7ef | Venkatesh Pallipadi | 14 November 2006, 01:47:44 UTC | [CPUFREQ] Fix the bug in duplicate freq elimination code in acpi-cpufreq Fix the bug in duplicate states elimination in acpi-cpufreq. Bug: Due to duplicate state elimiation in the loop earlier, the number of valid_states can be less than perf->state_count, in which case freq_table was ending up with some garbage/uninitialized entries in the table. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> From: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:20:50 UTC |
8b9c667 | Gary Hade | 10 November 2006, 19:20:47 UTC | [CPUFREQ] speedstep-centrino should ignore upper performance control bits On some systems there could be bits set in the upper half of the control value provided by the _PSS object. These bits are only relevant for cpufreq drivers that use IO ports which are not currently supported by the speedstep-centrino driver. The current MSR oriented code assumes that upper bits are not set and thus fails to work correctly when they are. e.g. the control and status value equality check failed on the IBM x3650 even though the ACPI spec allows inequality. Signed-off-by: Gary Hade <garyhade@us.ibm.com> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:20:49 UTC |
55e3373 | Jean Delvare | 09 November 2006, 17:29:35 UTC | [CPUFREQ] Optimize gx-suspmod revision ID fetching We don't need a temporary variable to get the PCI revision ID. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Dave Jones <davej@redhat.com> | 12 December 2006, 22:20:49 UTC |
df3e0d1 | bibo,mao | 12 December 2006, 20:04:42 UTC | [IA64] kprobe clears qp bits for special instructions On IA64 there exists some special instructions which always need to be executed regradless of qp bits, such as com.crel.unc, tbit.trel.unc etc. This patch clears qp bits when inserting kprobe trap code and disables probepoint on slot 1 for these special instructions. Signed-off-by: bibo,mao <bibo.mao@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 20:04:42 UTC |
08ed38b | Tony Luck | 14 November 2006, 17:33:38 UTC | [IA64] enable trap code on slot 1 Because slot 1 of one instr bundle crosses border of two consecutive 8-bytes, kprobe on slot 1 is disabled. This patch enables kprobe on slot1, it only replaces higher 8-bytes of the instruction bundle and changes the exception code to ignore the low 12 bits of the break number (which is across the border in the lower 8-bytes of the bundle). For those instructions which must execute regardless qp bits, kprobe on slot 1 is still disabled. Signed-off-by: bibo,mao <bibo.mao@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 20:00:55 UTC |
75f6a1d | Tony Luck | 12 December 2006, 19:56:36 UTC | [IA64] Take defensive stance on ia64_pal_get_brand_info() Stephane thought he saw a problem here (but was just confused by the return value from ia64_pal_get_brand_info()). But we should be more defensive here in case an prototype PAL for a future processor doesn't implement this PAL call. Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 19:56:36 UTC |
7521663 | Sean Hefty | 01 December 2006, 00:53:41 UTC | RDMA/cma: Export rdma cm interface to userspace Export the rdma cm interfaces to userspace via a misc device. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:22 UTC |
628e5f6 | Sean Hefty | 01 December 2006, 00:44:16 UTC | RDMA/cma: Add support for RDMA_PS_UDP Allow the use of UD QPs through the rdma_cm, in order to provide address translation services for resolving IB addresses for datagram messages using SIDR. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:21 UTC |
0fe313b | Sean Hefty | 01 December 2006, 00:37:15 UTC | RDMA/cma: Allow early transition to RTS to handle lost CM messages During connection establishment, the passive side of a connection can receive messages from the active side before the connection event has been delivered to the user. Allow the passive side to send messages in response to received data before the event is delivered. To handle the case where the connection messages are lost, a new rdma_notify() function is added that users may invoke to force a connection into the established state. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:21 UTC |
a1b1b61 | Sean Hefty | 01 December 2006, 00:33:14 UTC | RDMA/cma: Report connect info with connect events Connection information was never given to the recipient of a connection request or reply message. Only the event was delivered. Report the connection data with the event to allows user to reject the connection based on the requested parameters, or adjust their resources to match the request. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:21 UTC |
9b2e9c0 | Sean Hefty | 01 December 2006, 00:30:47 UTC | RDMA/cma: Remove unneeded qp_type parameter from rdma_cm The qp_type parameter into the rdma_cm is unneeded, and can be misleading. The QP type should be determined from the port space. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:21 UTC |
0a1336c | Roland Dreier | 12 December 2006, 19:50:20 UTC | IB/ipath: Fix IRQ for PCI Express HCAs Commit 51f65ebc ("IB/ipath - program intconfig register using new HT irq hook"), which fixed interrupts for HyperTransport HCAs, broke PCI Express HCAs, because for those HCAs, the driver uses the value of pdev->irq before pci_enable_msi() and ends up getting a totally bogus IRQ number. Fix this by using the value of pdev->irq after pci_enable_msi(). Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:20 UTC |
ad1f979 | Krishna Kumar | 04 December 2006, 03:44:57 UTC | RDMA/amso1100: Fix memory leak in c2_qp_modify() vq_req is leaked in error cases. Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:20 UTC |
dee234f | Roland Dreier | 12 December 2006, 19:50:20 UTC | IB/iser: Remove unused "write-only" variables Remove variables that are set but then never looked at in the iSER initiator. These cleanups came from David Binderman's list of "set but never used" warnings from icc. Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:20 UTC |
44f8e3f | Roland Dreier | 12 December 2006, 19:50:20 UTC | IB/ipath: Remove unused "write-only" variables Remove variables that are set but then never looked at in the ipath driver. These cleanups came from David Binderman's list of "set but never used" warnings from icc. Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:20 UTC |
f47e22c | Roland Dreier | 12 December 2006, 19:50:19 UTC | IB/fmr: ib_flush_fmr_pool() may wait too long ib_flush_fmr_pool() stashes away the request generation number properly, but then goes ahead and rereads it every time it tests whether the flush generation number has caught up. This means that there is a theoretical possibility of livelock, if the request generation number keeps getting bumped and the flush generation number never catches up. The fix is simple: use the request generation number read at the beginning of the function. Also, atomic_inc() followed by atomic_read() can be replaced with atomic_int_return(). There's no real requirement for atomicity here but we might as well shrink the code. This bug was discovered using David Binderman's list of "set but never used" warnings from icc. Signed-off-by: Roland Dreier <rolandd@cisco.com> | 12 December 2006, 19:50:19 UTC |
a460ef8 | Dean Nelson | 22 November 2006, 14:25:00 UTC | [IA64] fix possible XPC deadlock when disconnecting This patch eliminates a potential deadlock that is possible when XPC disconnects a channel to a partition that has gone down. This deadlock will occur if at least one of the kthreads created by XPC for the purpose of making callouts to the channel's registerer is detained in the registerer and will not be returning back to XPC until some registerer request occurs on the now downed partition. The potential for a deadlock is removed by ensuring that there always is a kthread available to make the channel disconnecting callout to the registerer. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 19:48:53 UTC |
1cf24bd | Jack Steiner | 22 November 2006, 15:55:08 UTC | [IA64] - Reduce overhead of FP exception logging messages Improve the scalability of the fpswa code that rate-limits logging of messages. There are 2 distinctly different problems in this code. 1) If prctl is used to disable logging, last_time is never updated. The result is that fpu_swa_count is zeroed out on EVERY fp fault. This causes a very very hot cache line. The fix reduces the wallclock time of a 1024p FP exception test from 28734 sec to 19 sec!!! 2) On VERY large systems, excessive messages are logged because multiple cpus can each reset or increment fpu_swa_count at about the same time. The result is that hundreds of messages are logged each second. The fixes reduces the logging rate to ~1 per second. Signed-off-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 19:47:09 UTC |
8b9c106 | Tony Luck | 12 December 2006, 19:18:55 UTC | [IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid' This warning only shows up with CONFIG_VIRTUAL_MEM_MAP=y and CONFIG_FLATMEM=y. There is only one caller left for register_active_ranges() from the contig.c code ... so it doesn't need to pick up the node number, the node number is always zero. Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 19:18:55 UTC |
18b36c7 | Cal Peake | 12 December 2006, 19:18:16 UTC | Fix inotify maintainers entry Update the inotify entry in MAINTAINERS to be consistent with the rest of the file. Signed-off-by: Cal Peake <cp@absolutedigital.net> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:18:16 UTC |
86327d1 | Dave Jones | 12 December 2006, 19:16:36 UTC | Fix typo in new debug options. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:16:36 UTC |
5e61447 | Dave Jones | 12 December 2006, 19:15:40 UTC | Jon needs a new shift key. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:15:40 UTC |
b87576d | Robert P. J. Day | 12 December 2006, 19:07:35 UTC | fs: Convert kmalloc() + memset() to kzalloc() in fs/. Convert the single available instance of kmalloc() + memset() to kzalloc() in the fs/ directory. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:07:35 UTC |
df4365c | Robert P. J. Day | 12 December 2006, 19:05:50 UTC | configfs.h: Remove dead macro definitions. Delete the __ATTR-related macro definitions since these are now defined in include/linux/sysfs.h. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:05:50 UTC |
bef1f40 | Robert P. J. Day | 12 December 2006, 19:04:19 UTC | kconfig: Standardize "depends" -> "depends on" in Kconfig files Standardize the miniscule percentage of occurrences of "depends" in Kconfig files to "depends on", and update kconfig-language.txt to reflect that. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:04:19 UTC |
c48e3fc | Yan Burman | 12 December 2006, 19:03:10 UTC | e100: replace kmalloc with kcalloc Replace kmalloc+memset with kcalloc Signed-off-by: Yan Burman <burman.yan@gmail.com> Acked-By: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 19:03:10 UTC |
0268bd0 | Yan Burman | 12 December 2006, 18:54:52 UTC | um: replace kmalloc+memset with kzalloc Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman <burman.yan@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:54:52 UTC |
47c6bf7 | Peter Zijlstra | 12 December 2006, 18:48:59 UTC | fix typo in net/ipv4/ip_fragment.c Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:48:59 UTC |
f889a26 | Tony Luck | 12 December 2006, 18:47:36 UTC | [IA64] s/termios/ktermios/ in simserial.c This got missed in 606d099cdd1080bbb50ea50dc52d98252f8f10a1 Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 18:47:36 UTC |
e103650 | Nicolas Pitre | 12 December 2006, 18:32:29 UTC | [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem Commit 2d4ba4a3b9aef95d328d74a17ae84f8d658059e2 introduced a dependency that was never meant to exist when the ac97_bus.c module was created. Move ac97_bus.c up the directory hierarchy to make sure it is built when selected even if sound is configured out so things work as originally intended. Signed-off-by: Nicolas Pitre <nico@cam.org> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 December 2006, 18:43:21 UTC |
53569ab | Alistair John Strachan | 12 December 2006, 18:28:50 UTC | include/linux/compiler.h: reject gcc 3 < gcc 3.2 The kernel doesn't compile with GCC <3.2, do not allow it to succeed if GCC 3.0.x or 3.1.x are used. Signed-off-by: Alistair John Strachan <s0348365@sms.ed.ac.uk> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:28:50 UTC |
979c6a1 | Jesper Juhl | 12 December 2006, 18:25:11 UTC | Kconfig: fix spelling error in config KALLSYMS help text Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-By: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:25:11 UTC |
93aec20 | Rolf Eike Beer | 12 December 2006, 18:23:02 UTC | Remove duplicate "have to" in comment Introduced in commit 7cc13edc139108bb527b692f0548dce6bc648572. Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Acked-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:23:02 UTC |
741441a | Linus Torvalds | 12 December 2006, 18:21:01 UTC | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: [patch 3/3] OCFS2 Configurable timeouts - Protocol changes [patch 2/3] OCFS2 Configurable timeouts [patch 1/3] OCFS2 - Expose struct o2nm_cluster ocfs2: Synchronize feature incompat flags in ocfs2_fs.h ocfs2: update mount option documentation ocfs2: local mounts | 12 December 2006, 18:21:01 UTC |
87c18aa | Thomas Hisch | 12 December 2006, 18:20:35 UTC | Fix small typo in drivers/serial/icom.c Signed-off-by: Thomas Hisch <t.hisch@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:20:35 UTC |
53da576 | Horms | 12 December 2006, 09:06:13 UTC | [IA64] kexec/kdump: tidy up declaration of relocate_new_kernel_t * Make NORET_TYPE and ATTRIB_NORET in line with the declaration for other architectures * Add parameter names Signed-Off-By: Simon Horman <horms@verge.net.au> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 18:12:08 UTC |
ad1c3ba | Horms | 12 December 2006, 09:08:10 UTC | [IA64] Kexec/Kdump: honour non-zero crashkernel offset. There seems to be a value in both allowing the kernel to determine the base offset of the crashkernel automatically and allowing users's to sepcify it. The old behaviour on ia64, which is still the current behaviour on most architectures is for the user to always specify the address. Recently ia64 was changed so that it is always automatically determined. With this patch the kernel automatically determines the offset if the supplied value is 0, otherwise it uses the value provided. This should probably be backed by a documentation change. Signed-Off-By: Simon Horman <horms@verge.net.au> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 18:11:37 UTC |
45a98fc | Horms | 12 December 2006, 08:49:03 UTC | [IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations Actually, on reflection I think that there is a good case for keeping the options separate. I am thinking particularly of people who want a very small crashdump kernel and thus don't want to compile in kexec. The patch below should fix things up so that all valid combinations of KEXEC, CRASH_DUMP and VMCORE compile cleanly - VMCORE depends on CRASH_DUMP which is why I said valid combinations. In a nutshell it just untangles unrelated code and switches around a few defines. Please note that it creats a new file, arch/ia64/kernel/crash_dump.c This is in keeping with the i386 implementation. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 18:11:00 UTC |
5ea084e | Samuel Tardieu | 12 December 2006, 18:09:40 UTC | Use consistent casing in help message Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:09:40 UTC |
adf142e | Jay Lan | 11 December 2006, 23:39:23 UTC | [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0 This is an SN specific patch. Architectually, cpu_init is always called twice on cpu 0 and thus resulted in two SN_SAL_SET_CPU_NUMBER calls. This was harmless in production kernel; however, it can cause problem on booting up a crashdump kernel at Altix. Here is the patch that detects the second sn_cpu_init call and skips the second call to SN_SAL_SET_CPU_NUMBER. Signed-Off-By: Jay Lan <jlan@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> | 12 December 2006, 18:09:39 UTC |
d23edbd | Jan Engelhardt | 12 December 2006, 18:07:45 UTC | EXT{2,3,4}_FS: remove outdated part of the help text Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Acked-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> | 12 December 2006, 18:07:45 UTC |
659dba3 | Linus Torvalds | 12 December 2006, 17:57:55 UTC | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Fix OMAP clock prescaler to match the comment i2c: Refactor a kfree in i2c-dev i2c: Fix return value check in i2c-dev i2c: Enable PEC on more i2c-i801 devices i2c: Discard the i2c algo del_bus wrappers i2c: New ARM Versatile/Realview bus driver i2c: fix broken ds1337 initialization i2c: i2c-i801 documentation update i2c: Use the __ATTR macro where possible i2c: Whitespace cleanups i2c: Use put_user instead of copy_to_user where possible i2c: New Atmel AT91 bus driver i2c: Add support for nested i2c bus locking i2c: Cleanups to the i2c-nforce2 bus driver i2c: Add request/release_mem_region to i2c-ibm_iic bus driver i2c: New Philips PNX bus driver i2c: Delete the broken i2c-ite bus driver i2c: Update the list of driver IDs i2c: Fix documentation typos | 12 December 2006, 17:57:55 UTC |
3640543 | Ingo Molnar | 12 December 2006, 16:20:42 UTC | [PATCH] netpoll: fix netpoll lockup current -git doesnt boot on my laptop due to netpoll not unlocking the tx lock in the else branch. booted this up on my laptop with lockdep enabled and there are no locking complaints and it works fine. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 December 2006, 16:37:51 UTC |
d224a93 | Linus Torvalds | 12 December 2006, 16:14:46 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits) sh: Fixup SH-2 BUG() trap handling. sh: Use early_param() for earlyprintk parsing. sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096. sh: Fixup .data.page_aligned. sh: Hook up SH7722 scif ipr interrupts. sh: Fixup sh_bios() trap handling. sh: SH-MobileR SH7722 CPU support. sh: Fixup dma_cache_sync() callers. sh: Convert remaining remap_area_pages() users to ioremap_page_range(). sh: Fixup kernel_execve() for syscall cleanups. sh: Fix get_wchan(). sh: BUG() handling through trapa vector. rtc: rtc-sh: alarm support. rtc: rtc-sh: fix rtc for out-by-one for the month. sh: Kill off unused SE7619 I/O ops. serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings. sh: Split out atomic ops logically. sh: Fix Solution Engine 7619 build. sh: Trivial build fixes for SH-2 support. sh: IPR IRQ updates for SH7619/SH7206. ... | 12 December 2006, 16:14:46 UTC |
b57bd06 | Ingo Molnar | 12 December 2006, 12:49:35 UTC | [PATCH] net, 8139too.c: fix netpoll deadlock fix deadlock in the 8139too driver: poll handlers should never forcibly enable local interrupts, because they might be used by netpoll/printk from IRQ context. ================================= [ INFO: inconsistent lock state ] 2.6.19 #11 --------------------------------- inconsistent {softirq-on-W} -> {in-softirq-W} usage. swapper/1 [HC0[0]:SC1[1]:HE1:SE0] takes: (&npinfo->poll_lock){-+..}, at: [<c0350a41>] net_rx_action+0x64/0x1de {softirq-on-W} state was registered at: [<c0134c86>] mark_lock+0x5b/0x39c [<c0135012>] mark_held_locks+0x4b/0x68 [<c01351e9>] trace_hardirqs_on+0x115/0x139 [<c02879e6>] rtl8139_poll+0x3d7/0x3f4 [<c035c85d>] netpoll_poll+0x82/0x32f [<c035c775>] netpoll_send_skb+0xc9/0x12f [<c035cdcc>] netpoll_send_udp+0x253/0x25b [<c0288463>] write_msg+0x40/0x65 [<c011cead>] __call_console_drivers+0x45/0x51 [<c011cf16>] _call_console_drivers+0x5d/0x61 [<c011d4fb>] release_console_sem+0x11f/0x1d8 [<c011d7d7>] register_console+0x1ac/0x1b3 [<c02883f8>] init_netconsole+0x55/0x67 [<c010040c>] init+0x9a/0x24e [<c01049cf>] kernel_thread_helper+0x7/0x10 [<ffffffff>] 0xffffffff irq event stamp: 819992 hardirqs last enabled at (819992): [<c0350a16>] net_rx_action+0x39/0x1de hardirqs last disabled at (819991): [<c0350b1e>] net_rx_action+0x141/0x1de softirqs last enabled at (817552): [<c01214e4>] __do_softirq+0xa3/0xa8 softirqs last disabled at (819987): [<c0106051>] do_softirq+0x5b/0xc9 other info that might help us debug this: no locks held by swapper/1. stack backtrace: [<c0104d88>] dump_trace+0x63/0x1e8 [<c0104f26>] show_trace_log_lvl+0x19/0x2e [<c010532d>] show_trace+0x12/0x14 [<c0105343>] dump_stack+0x14/0x16 [<c0134980>] print_usage_bug+0x23c/0x246 [<c0134d33>] mark_lock+0x108/0x39c [<c01356a7>] __lock_acquire+0x361/0x9ed [<c0136018>] lock_acquire+0x56/0x72 [<c03aff1f>] _spin_lock+0x35/0x42 [<c0350a41>] net_rx_action+0x64/0x1de [<c0121493>] __do_softirq+0x52/0xa8 [<c0106051>] do_softirq+0x5b/0xc9 [<c0121338>] irq_exit+0x3c/0x48 [<c0106163>] do_IRQ+0xa4/0xbd [<c01047c6>] common_interrupt+0x2e/0x34 [<c011db92>] vprintk+0x2c0/0x309 [<c011dbf6>] printk+0x1b/0x1d [<c01003f2>] init+0x80/0x24e [<c01049cf>] kernel_thread_helper+0x7/0x10 ======================= Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 December 2006, 16:10:44 UTC |
99a3eb3 | Ingo Molnar | 12 December 2006, 11:10:28 UTC | [PATCH] lockdep: fix seqlock_init() seqlock_init() needs to use spin_lock_init() for dynamic locks, so that lockdep is notified about the presence of a new lock. (this is a fallout of the recent networking merge, which started using the so-far unused seqlock_init() API.) This fix solves the following lockdep-internal warning on current -git: INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. __lock_acquire+0x10c/0x9f9 lock_acquire+0x56/0x72 _spin_lock+0x35/0x42 neigh_destroy+0x9d/0x12e neigh_periodic_timer+0x10a/0x15c run_timer_softirq+0x126/0x18e __do_softirq+0x6b/0xe6 do_softirq+0x64/0xd2 ksoftirqd+0x82/0x138 Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 12 December 2006, 16:10:44 UTC |
d907dd2 | Linus Torvalds | 12 December 2006, 16:01:50 UTC | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated | 12 December 2006, 16:01:50 UTC |
11c302c | Linus Torvalds | 12 December 2006, 15:45:48 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Fix conflicting superblock flags | 12 December 2006, 15:45:48 UTC |
2a7e9a2 | Mauro Carvalho Chehab | 11 December 2006, 08:37:14 UTC | V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated i2c defines two callbacks (inb/outb). On ia64, since it defines also two macros with those names, it causes the following errors: drivers/media/video/usbvision/usbvision-i2c.c:64:39: macro "outb" passed 4 arguments, but takes just 2 drivers/media/video/usbvision/usbvision-i2c.c: In function `try_write_address': drivers/media/video/usbvision/usbvision-i2c.c:64: warning: assignment makes integer from pointer without a cast drivers/media/video/usbvision/usbvision-i2c.c:89:38: macro "inb" passed 4 arguments, but takes just 1 drivers/media/video/usbvision/usbvision-i2c.c: In function `try_read_address': drivers/media/video/usbvision/usbvision-i2c.c:89: warning: assignment makes integer from pointer without a cast drivers/media/video/usbvision/usbvision-i2c.c:85: warning: unused variable `buf' drivers/media/video/usbvision/usbvision-i2c.c:173:53: macro "inb" passed 4 arguments, but takes just 1 drivers/media/video/usbvision/usbvision-i2c.c: In function `usb_xfer': drivers/media/video/usbvision/usbvision-i2c.c:173: warning: assignment makes integer from pointer without a cast drivers/media/video/usbvision/usbvision-i2c.c:179:54: macro "outb" passed 4 arguments, but takes just 2 drivers/media/video/usbvision/usbvision-i2c.c:179: warning: assignment makes integer from pointer without a cast thanks to Andrew Morton for pointing this. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> | 12 December 2006, 09:37:09 UTC |
3353026 | FUJITA Tomonori | 12 December 2006, 09:26:55 UTC | [PATCH] remove unnecessary blk_queue_bounce in SG_IO When I converted the original patch, I left unnecessary blk_queue_bounce in SG_IO. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Jens Axboe <jens.axboe@oracle.com> | 12 December 2006, 09:26:55 UTC |
77d172c | FUJITA Tomonori | 11 December 2006, 09:01:34 UTC | [PATCH] fix SG_IO bio leak This patch fixes bio leaks in SG_IO. rq->bio can be changed after io completion, so we need to reset rq->bio before calling blk_rq_unmap_user() http://marc.theaimsgroup.com/?l=linux-kernel&m=116570666807983&w=2 Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com> | 12 December 2006, 09:22:23 UTC |
2b02a17 | Boaz Harrosh | 05 December 2006, 09:19:14 UTC | [PATCH] remove blk_queue_activity_fn While working on bidi support at struct request level I have found that blk_queue_activity_fn is actually never used. The only user is in ide-probe.c with this code: /* enable led activity for disk drives only */ if (drive->media == ide_disk && hwif->led_act) blk_queue_activity_fn(q, hwif->led_act, drive); And led_act is never initialized anywhere. (Looking back at older kernels it was used in the PPC arch, but was removed around 2.6.18) Unless it is all for future use off course. (this patch is against linux-2.6-block.git as off 2006/12/4) Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com> | 12 December 2006, 09:22:23 UTC |
4259cb2 | Linus Torvalds | 12 December 2006, 02:35:17 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits) [NETPOLL]: Fix local_bh_enable() warning. [IPVS]: Make ip_vs_sync.c <= 80col wide. [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep() [HAMRADIO]: Fix baycom_epp.c compile failure. [DCCP]: Whitespace cleanups [DCCP] ccid3: Fixup some type conversions related to rtts [DCCP] ccid3: BUG-FIX - conversion errors [DCCP] ccid3: Reorder packet history source file [DCCP] ccid3: Reorder packet history header file [DCCP] ccid3: Make debug output consistent [DCCP] ccid3: Perform history operations only after packet has been sent [DCCP] ccid3: TX history - remove unused field [DCCP] ccid3: Shift window counter computation [DCCP] ccid3: Sanity-check RTT samples [DCCP] ccid3: Initialise RTT values [DCCP] ccid: Deprecate ccid_hc_tx_insert_options [DCCP]: Warn when discarding packet due to internal errors [DCCP]: Only deliver to the CCID rx side in charge [DCCP]: Simplify TFRC calculation [DCCP]: Debug timeval operations ... | 12 December 2006, 02:35:17 UTC |
cd39301 | Linus Torvalds | 12 December 2006, 02:28:59 UTC | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: [AVR32] Add missing #include <linux/param.h> to delay.c [AVR32] Pass dev parameter to dma_cache_sync() [AVR32] Implement intc_get_pending() [AVR32] Don't include <asm/delay.h> [AVR32] Put the chip in "stop" mode when halting the system [AVR32] Set flow handler for external interrupts [AVR32] Remove unused file [AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data [AVR32] Move ethernet tag parsing to board-specific code [AVR32] Add macb1 platform_device [AVR32] Portmux API update | 12 December 2006, 02:28:59 UTC |
13d7d84 | Linus Torvalds | 12 December 2006, 02:24:58 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (36 commits) [POWERPC] Generic BUG for powerpc [PPC] Fix compile failure do to introduction of PHY_POLL [POWERPC] Only export __mtdcr/__mfdcr if CONFIG_PPC_DCR is set [POWERPC] Remove old dcr.S [POWERPC] Fix SPU coredump code for max_fdset removal [POWERPC] Fix irq routing on some 32-bit PowerMacs [POWERPC] ps3: Add vuart support [POWERPC] Support ibm,dynamic-reconfiguration-memory nodes [POWERPC] dont allow pSeries_probe to succeed without initialising MMU [POWERPC] micro optimise pSeries_probe [POWERPC] Add SPURR SPR to sysfs [POWERPC] Add DSCR SPR to sysfs [POWERPC] Fix 440SPe CPU table entry [POWERPC] Add support for FP emulation for the e300c2 core [POWERPC] of_device_register: propagate device_create_file return code [POWERPC] Fix mmap of PCI resource with hack for X [POWERPC] iSeries: head_64.o needs to depend on lparmap.s [POWERPC] cbe_thermal: Fix initialization of sysfs attribute_group [POWERPC] Remove QE header files from lite5200.c [POWERPC] of_platform_make_bus_id(): make `magic' int ... | 12 December 2006, 02:24:58 UTC |
cbb8fc0 | Franck Bui-Huu | 06 December 2006, 15:48:28 UTC | [MIPS] paging_init(): use highend_pfn/highstart_pfn This patch makes paging_init() use highend_pfn/highstart_pfn globals. It removes the need of 'high' local which was needed only by HIGHMEM config. More important perhaps, it fixes a bug when HIGHMEM is set but there's actually no physical highmem (highend_pfn = 0) Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
b228f4c | Ralf Baechle | 11 December 2006, 15:33:30 UTC | [MIPS] Malta: Resurrect MTD support for onboard flash. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
2efac77 | Ralf Baechle | 11 December 2006, 11:54:52 UTC | [MIPS] Discard .exit.text and .exit.data at runtime. While the recent cset 86384d544157db23879064cde36061cdcafc6794 did improve things it didn't resolve all the problems. So bite the bullet and discard .exit.text and .exit.data at runtime. Which of course sucks because it bloats binaries with code that will never ever be used but it's the only thing that will work reliable as demonstrated by the function sd_major() in drivers/scsi/sd.c. Gcc may compile sd_major() using a jump table which it will put into .rodata. If it also inlines sd_major's function body into exit_sd() which gcc > 3.4.x does. If CONFIG_BLK_DEV_SD has been set to y we would like ld to discard exit_sd's code at link time. However sd_major happens to contain a switch statement which gcc will compile using a jump table in .rodata on the architectures I checked. So, when ld later discards .exit.text only the jump table in .rodata with its stale references to the discard .exit.text will be left which any no antique ld will honor with a link error. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
8b2f355 | Ralf Baechle | 11 December 2006, 04:17:30 UTC | [MIPS] IP27: Don't drag <asm/sn/arch.h> into topology.h. Another way that old SGI types were getting dragged into generic code. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
2bbc5bd | Ralf Baechle | 11 December 2006, 04:07:40 UTC | [MIPS] IP27: Move definition of nic_t to its sole user. This also fixes the duplicate definition of nic_t in the s2io driver. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
2f3643a | Ralf Baechle | 11 December 2006, 04:00:37 UTC | [MIPS] IP27: Don't include <asm/sn/arch.h>. Nothing <asm/sn/arch.h> defines is used. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
b723782 | Ralf Baechle | 11 December 2006, 00:43:58 UTC | [MIPS] compat.h uses struct pt_regs so needs to include ptrace.h. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 12 December 2006, 01:46:24 UTC |
a49f99f | Andrew Morton | 12 December 2006, 01:24:46 UTC | [NETPOLL]: Fix local_bh_enable() warning. During boot we get: netconsole: device eth0 not up yet, forcing it e1000: eth0: e1000_watchdog: NIC Link is Up 100 Mbps Full Duplex WARNING (!__warned) at kernel/softirq.c:137 local_bh_enable() Call Trace: [<ffffffff80235baf>] local_bh_enable+0x41/0xa3 [<ffffffff8045ab8e>] netpoll_send_skb+0x116/0x144 [<ffffffff8045b1ee>] netpoll_send_udp+0x263/0x271 [<ffffffff803d41ec>] write_msg+0x42/0x5e [<ffffffff80230c9b>] __call_console_drivers+0x5f/0x70 [<ffffffff80230d19>] _call_console_drivers+0x6d/0x71 [<ffffffff802313f0>] release_console_sem+0x148/0x1ec [<ffffffff802316ce>] register_console+0x1b1/0x1ba [<ffffffff803d4178>] init_netconsole+0x54/0x68 [<ffffffff802071ae>] init+0x152/0x308 [<ffffffff804dac8b>] _spin_unlock_irq+0x14/0x30 [<ffffffff8022c15e>] schedule_tail+0x43/0x9f [<ffffffff8020a758>] child_rip+0xa/0x12 Herbert sayeth: Normally networking isn't invoked with interrupts turned off, but I suppose we don't have a choice here. This is unique being a place where you can get called with BH on, off, or IRQs off. Given that this is only used for printk, the easiest solution is probably just to disable local IRQs instead of BH. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 12 December 2006, 01:24:46 UTC |
e9cfc14 | Yoshinori Sato | 12 December 2006, 00:11:45 UTC | sh: Fixup SH-2 BUG() trap handling. This adds in support for the BUG() trap on SH-2. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org> | 12 December 2006, 00:11:45 UTC |
b641fe0 | Paul Mundt | 12 December 2006, 00:00:47 UTC | sh: Use early_param() for earlyprintk parsing. Signed-off-by: Paul Mundt <lethal@linux-sh.org> | 12 December 2006, 00:00:47 UTC |
e2dfb91 | Paul Mundt | 11 December 2006, 23:53:29 UTC | sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096. Signed-off-by: Paul Mundt <lethal@linux-sh.org> | 11 December 2006, 23:53:29 UTC |
f668f55 | Paul Mundt | 11 December 2006, 23:50:36 UTC | sh: Fixup .data.page_aligned. This had a bogus .data.idt reference, fix it up.. Signed-off-by: Paul Mundt <lethal@linux-sh.org> | 11 December 2006, 23:50:36 UTC |
05c8690 | Paul Mundt | 11 December 2006, 23:49:06 UTC | sh: Hook up SH7722 scif ipr interrupts. Add the SCIF IRQs to the IPR table for SH7722. Signed-off-by: Paul Mundt <lethal@linux-sh.org> | 11 December 2006, 23:49:06 UTC |