commit cd52d1ee9a92587b242d946a2300a3245d3b885a Author: Linus Torvalds Date: Fri Nov 11 17:43:36 2005 -0800 Linux v2.6.15-rc1 As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release. commit 049b3ff5a86d0187184a189d2e31b8654d58fe22 Author: Neil Horman Date: Fri Nov 11 16:08:24 2005 -0800 [SCTP]: Include ulpevents in socket receive buffer accounting. Also introduces a sysctl option to configure the receive buffer accounting policy to be either at socket or association level. Default is all the associations on the same socket share the receive buffer. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 19c7e9eef503dc1ae926f3d26c56f88bee568d7b Author: Vladislav Yasevich Date: Fri Nov 11 16:07:40 2005 -0800 [SCTP]: Fix ia64 NaT consumption fault with sctp_sideffect commands. On ia64, it is possible to get NaT Consumption Fault and a kernel panic when initializing sctp sideeffect commands arguments. The union sctp_arg_t contains different sized elements and when loading a smaller sized element (32 or 16 bits), it is possible for a speculative load to fail and result in a NaT bit set which causes a kernel crash. The easy way to get around it is to load the largerst member of the union. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 1e7d3d90c95b32374057e454417b2f50440be20e Author: Vladislav Yasevich Date: Fri Nov 11 16:06:16 2005 -0800 [SCTP]: Remove timeouts[] array from sctp_endpoint. The socket level timeout values are maintained in sctp_sock and association level timeouts are in sctp_association. So there is no need for ep->timeouts. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 23ec47a0889dabf4b9e7f8d52e848194734159ee Author: Vladislav Yasevich Date: Fri Nov 11 16:05:55 2005 -0800 [SCTP]: Fix potential NULL pointer dereference in sctp_v4_get_saddr It is possible to get to sctp_v4_get_saddr() without a valid association. This happens when processing OOTB packets and the cached route entry is no longer valid. However, when responding to OOTB packets we already properly set the source address based on the information in the OOTB packet. So, if we we get to sctp_v4_get_saddr() without an association we can simply return. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 8eb55910521f3449a8125a38dd32fb676703395d Author: David S. Miller Date: Fri Nov 11 15:05:47 2005 -0800 [IPV6]: Fix inet6_init missing unregister. Based mostly upon a patch from Olaf Kirch When initialization fails in inet6_init(), we should unregister the PF_INET6 socket ops. Also, check sock_register()'s return value for errors. Signed-off-by: David S. Miller commit 85837ebdd7bb3e96a60e9b4c6af6c60d1273bc67 Author: Mike Christie Date: Fri Nov 11 16:38:53 2005 -0600 [PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc changes) scsi_wait_req does not exist any more in the SCSI layer. This patch makes it so libata can compile again. Signed-off-by: Mike Christie Signed-off-by: Linus Torvalds commit 39990b5eb93c624abc345f81c30f1a9c7f2ec3f3 Author: Linus Torvalds Date: Fri Nov 11 14:27:32 2005 -0800 ppc64: default build as the merged 'powerpc' architecture After the last merge of the new unified 'powerpc' architecture, ppc64 no longer compiles cleanly as a standalone architecture. Some bits and pieces still exist as files under the old ppc64 hierarchy, but the old "ARCH=ppc64" is dead. So if "uname" says ppc64, that now implies that the default architecture should be "powerpc". Acked-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit c6bd2328434a3a6f8f6bc6f77f49c12ec966448a Author: Russell King Date: Fri Nov 11 21:56:33 2005 +0000 [ARM] Update mach-types Signed-off-by: Russell King commit 60cef2988af29299f0cc01fc8f0a5dcf55baf776 Author: Lennert Buytenhek Date: Fri Nov 11 21:53:30 2005 +0000 [ARM] 3147/1: update ixp2000 defconfigs to 2.6.14-git13 Patch from Lennert Buytenhek Update the ixp2000 defconfigs to 2.6.14-git13. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 8adbb3718d6cead304f84f7dd60ad65274df0b15 Author: Nicolas Pitre Date: Fri Nov 11 21:51:49 2005 +0000 [ARM] 3152/1: make various assembly local labels actually local (the rest) Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit a9c4814d8db200052c07d8b68e76c134682c4569 Author: Nicolas Pitre Date: Fri Nov 11 21:51:48 2005 +0000 [ARM] 3151/1: make various assembly local labels actually local (io-*.S) Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 7ba11a9c1598ced7d719648a5998a2a81ba06dc9 Author: Nicolas Pitre Date: Fri Nov 11 21:51:47 2005 +0000 [ARM] 3150/1: make various assembly local labels actually local (uaccess.S) Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 4d45cbacb8488ae3172065e4fca608079492231b Author: David S. Miller Date: Fri Nov 11 12:48:56 2005 -0800 [SPARC64]: Restore 2.4.x /proc/cpuinfo behavior for "ncpus probed" field. Noticed by Tom 'spot' Callaway. Even on uniprocessor we always reported the number of physical cpus in the system via /proc/cpuinfo. But when this got changed to use num_possible_cpus() it always reads as "1" on uniprocessor. This change was unintentional. So scan the firmware device tree and count the number of cpu nodes, and report that, as we always did. Signed-off-by: David S. Miller commit 9eb5c94ef217d61d974f384b29b7298490b0a4d9 Author: Patrick Caulfield Date: Fri Nov 11 12:04:28 2005 -0800 [DECNET]: fix SIGPIPE Currently recvmsg generates SIGPIPE whereas sendmsg does not; for the other stacks it seems to be the other way round! It also fixes the bug where reading from a socket whose peer has shutdown returned -EINVAL rather than 0. Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit ff51224cab12845c8bd539ca1f2dc18cc851b445 Author: Mark Maule Date: Fri Nov 11 11:52:43 2005 -0600 [IA64-SGI] set altix preferred console Fix default VGA console on SN platforms. Since SN firmware does not pass enough ACPI information to identify VGA cards and the associated legacy IO/MEM addresses, we rely on the EFI PCDP table. Since the linux pcdp driver is optional (and overridden if console= directives are used) SN duplicates a portion of the pcdp scan code to identify if there is a usable console VGA adapter. Additionally, dup necessary pcdp related structs to avoid dragging drivers/pcdp.h into a more public location. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 837cd0bdf54dd954cd6aa43d250f75ab5db79617 Author: Robin Holt Date: Fri Nov 11 09:35:43 2005 -0600 [IA64] 4-level page tables This patch introduces 4-level page tables to ia64. I have run some benchmarks and found nothing interesting. Performance has consistently fallen within the noise range. It also introduces a config option (setting the default to 3 levels). The config option prevents having 4 level page tables with 64k base page size. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 177294d19174cf92de22434bb1fc9a8ecdbbe658 Author: Hironobu Ishii Date: Fri Nov 11 08:12:21 2005 -0600 [PATCH] ipmi: fix inconsistent spinlock usage Part of a patch was accidentally reverted, this corrects an inconsistent spinlock use in the IPMI message handler. Signed-off-by: Hironobu Ishii Signed-off-by: Corey Minyard Signed-off-by: Linus Torvalds commit c050970a257a4060e927e497a12323e961fcbadc Author: Jeff Garzik Date: Fri Nov 11 04:43:47 2005 -0500 [PATCH] TCP: fix vegas build Recent TCP changes broke the build. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit d12eb7e11cf30c30f639b2093735af2ac177830b Author: Dmitry Torokhov Date: Thu Nov 10 22:10:55 2005 -0500 [PATCH] Input: convert hdaps to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 560c22fe1fc8b3523ef422da4f1cf04aa22d1471 Author: Ralf Baechle Date: Tue Nov 8 22:02:35 2005 +0000 [PATCH] gt96100eth.c: Don't concatenate __FUNCTION__ with strings. As part of the ISO C9x conversion gcc deprecates concatenation with __FUNCTION__ because __FUNCTION__ is not a preprocessor macro. Signed-off-by: Clemens Buchacher Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 557934554655ac119d96a1bdb6ed75319bb9d1b1 Author: Pete Popov Date: Wed Nov 9 22:46:05 2005 -0500 [PATCH] smc91x: DB1200 support. The following patch support the SMC9111 present on DB1200 boards. Signed-off-by: Nicolas Pitre Signed-off-by: Jeff Garzik commit 05d9c84dfbbb654f60d98d465b58d4c68222ef1c Author: Ralf Baechle Date: Wed Nov 9 17:10:05 2005 +0000 [PATCH] SAA9730: Driver overhaul o Try to work around some of the undocumented "features" of the SAA9730 o Use netdev_priv() instead of the previous broken mechanism to allocate the private data structure. o Try to make sure we don't leak resources on exit. o No more need to call SET_MODULE_OWNER in 2.6. o Use pci_free_consistent instead of homegrown architecture-specific allocation. Signed-off-by: Ralf Baechle drivers/net/saa9730.c | 531 +++++++++++++++++++++++--------------------------- 1 files changed, 249 insertions(+), 282 deletions(-) Signed-off-by: Jeff Garzik commit 62ff0d0a0769f08806d3f50449a78f17420971e8 Author: Ralf Baechle Date: Wed Nov 9 16:44:02 2005 +0000 [PATCH] SAA9730: Whitespace cleanup. Kill trailing whitespace, replace leading whitespace with tabs. Signed-off-by: Ralf Baechle drivers/net/saa9730.c | 98 +++++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) Signed-off-by: Jeff Garzik commit 7a33e45a2498460d6daa20a1740d3185798d6026 Author: Ayaz Abdulla Date: Fri Nov 11 08:31:11 2005 -0500 [netdrvr forcedeth] phy address scan range Added phy address 0 to the phy scan. Signed-off-by: Ayaz Abdulla commit a971c32488569b5443c48168756e8ccfb0862c50 Author: Ayaz Abdulla Date: Fri Nov 11 08:30:38 2005 -0500 [netdrvr forcedeth] support for irq mitigation This patch contains support for different modes of interrupt mitigation of forcedeth. It includes changes based on Jeff's comments. Currently, the modes are changed through module parameters since ethtool does not support something similar. Signed-off-by: Ayaz Abdulla commit 4ea7f299bba0e4331bdbec4e1c1b90463478180d Author: Ayaz Abdulla Date: Fri Nov 11 08:29:59 2005 -0500 [netdrvr forcedeth] remove superfluous rx engine stop/start Signed-off-by: Ayaz Abdulla commit 125d128bec1bbf81be4c198243334a6153c0b023 Author: Kumar Gala Date: Wed Nov 9 12:13:11 2005 -0600 [PATCH] gianfar mii needs to zero out the mii_bus structure To ensure that phy_mask and any future elements of the mii_bus structure are initialized use kzalloc() instead of kmalloc(). This fixes an issue in which phy_mask was not being initialized and we would skip random phy addresses when scanning. Signed-off-by: Kumar Gala Signed-off-by: Jeff Garzik commit 1387780f7dbaa8c770fbbbec3b2f42cd9adf1921 Author: Frank Pavlic Date: Thu Nov 10 13:51:42 2005 +0100 [PATCH] s390: mail address changed [patch 7/7] s390: mail address changed From: Frank Pavlic - mail address changed to fpavlic@de.ibm.com Signed-off-by: Frank Pavlic diffstat: lcs.c | 4 ++-- qeth_main.c | 4 ++-- qeth_mpc.c | 2 +- qeth_mpc.h | 2 +- qeth_sys.c | 2 +- qeth_tso.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) Signed-off-by: Jeff Garzik commit 6c951b9051f2094dd98bafcb46e7e6b3e8813231 Author: Frank Pavlic Date: Thu Nov 10 13:51:25 2005 +0100 [PATCH] s390: introduce guestLan sniffer support in qeth [patch 6/7] s390: introduce guestLan sniffer support in qeth From: Peter Tiedemann - introduce guestLan sniffer support in qeth feature allows a linux in a virtual machine guest to become a network LAN sniffer, monitoring and recording the networking traffic within an entire guestLan. Signed-off-by: Frank Pavlic diffstat: qeth.h | 2 + qeth_main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qeth_mpc.h | 11 ++++--- 3 files changed, 102 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit e08d88cccbe0dfcfbaffb704d24e19803407935d Author: Frank Pavlic Date: Thu Nov 10 13:51:17 2005 +0100 [PATCH] s390: fix recovery failure of non-guestLAN devices [patch 5/7] s390: fix recovery failure of non-guestLAN devices From: Frank Pavlic - Recovery of non-guestLAN Layer 2 device failed due to trying to register the real MAC address we got from the READ_MAC adapter parameters command. We have to keep the "old" MAC address when we process the reply of a READ_MAC. Signed-off-by: Frank Pavlic diffstat: qeth.h | 12 ++++++------ qeth_main.c | 27 ++++++++++++++++----------- 2 files changed, 22 insertions(+), 17 deletions(-) Signed-off-by: Jeff Garzik commit d805d7c692e414c3adf01bb414a8c542ac2e67d1 Author: Frank Pavlic Date: Thu Nov 10 13:50:58 2005 +0100 [PATCH] s390: some more qeth fixes [patch 4/7] s390: some more qeth fixes From: Frank Pavlic From: Peter Tiedemann - possible race on list fixed by reset list processing after every operation - traffic hang fixed Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 6c88ad2ded1de1fe87e917b4a0a45873939c16e1 Author: Frank Pavlic Date: Thu Nov 10 13:49:28 2005 +0100 [PATCH] s390: qeth multicast address registration fixed [patch 3/7] s390: qeth multicast address registration fixed From: Klaus Dieter Wacker - when running in Layer2 mode we don't have to register the multicast IP address but only group mac address. Therefore for Layer 2 devices it is enough to go through dev->mc_list list and register these entries. Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 106 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 80 insertions(+), 26 deletions(-) Signed-off-by: Jeff Garzik commit 508cc2b0e078c806bb7cc8bba22fb97a4ca99b91 Author: Frank Pavlic Date: Thu Nov 10 13:49:15 2005 +0100 [PATCH] s390: minor modification in qeth layer2 code [patch 2/7] s390: minor modification in qeth layer2 code From: Frank Pavlic - use qeth_layer2_send_setdelvlan_cb to check return code of a SET/DELVLAN IP Assist command. It fits better in qeth's design and mechanism of IP Assist command handling. Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) Signed-off-by: Jeff Garzik commit bd389b9059d8ba4edc563e77f71909d88e566b2d Author: Frank Pavlic Date: Thu Nov 10 13:49:02 2005 +0100 [PATCH] s390: synthax checking for VIPA addresses fixed [patch 1/7] s390: synthax checking for VIPA addresses fixed From: Peter Tiedemann - synthax checking for VIPA addresses fixed Signed-off-by: Frank Pavlic diffstat: qeth.h | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------------- qeth_sys.c | 6 ++--- 2 files changed, 55 insertions(+), 16 deletions(-) Signed-off-by: Jeff Garzik commit e99f8b5efe78110e4af10f35ebf11feeef8f43b6 Author: Alan Cox Date: Tue Nov 8 14:09:44 2005 +0000 [PATCH] libata: propogate host private data from probe function This will let me chop the code size of several drivers right down. In many cases the actual private data is very useful and constant for a given host controller so being able to just pass it at probe time would be very useful indeed (eg with the via driver would could pass the udma clocking and reduce the code size, or with the AMD one the UDMA multiplier and the offset) Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b16a228d05a95b27d77d07a91688382f68ece8a7 Author: simon@thekelleys.org.uk Date: Sun Oct 30 15:50:15 2005 +0000 [PATCH] Atmel wireless update * Merge PCMCIA card table with new Brodowski PCMCIA id table. * Add missing entries to PCMCIA id table. * Other tweaks to conform with Documentation/driver-changes.txt (types, call request_region, etc) * Fix size of requested IO region. * Reduce printk verbosity. * Remove EXPERIMENTAL * tweak to association code - don't force shared key authentication when wep in use. Signed-off-by: Jeff Garzik commit 29179539dac74bf46b519b889602f23841be12e8 Author: Jeff Garzik Date: Fri Nov 11 08:08:03 2005 -0500 [libata sata_mv] add Adaptec 1420SA PCI ID Contributed by Jeroen commit 271c3f35bd36613513e2c2cc90dc914a84df116e Author: Paul Mackerras Date: Fri Nov 11 23:04:40 2005 +1100 powerpc: Fix some compile problems with the VDSO stuff We needed the VDSO symbols in the arch/ppc asm-offsets.c, and there were a few usages of _systemcfg still left lying around. Signed-off-by: Paul Mackerras commit 548ccebc2a79c780724529948c79de0613f96776 Author: Paul Mackerras Date: Fri Nov 11 22:36:34 2005 +1100 powerpc: Fix reading and writing SPRs from xmon on 32-bit When we created the instructions to read/write SPRs in xmon, we were setting up a ppc64-style procedure descriptor and calling that, which doesn't work in 32-bit. For 32-bit a function pointer just points to the instructions of the function. This fixes it to do the right thing for both 32-bit and 64-bit. Signed-off-by: Paul Mackerras commit 22c841c9a465a6b29a6140fcc5dae9fdb3c8674d Author: Paul Mackerras Date: Fri Nov 11 22:34:43 2005 +1100 powerpc: Initialize secondary CPU setup for 32-bit SMP 32-bit SMP powermacs weren't booting with ARCH=powerpc because the boot cpu wasn't saving away the state of various control registers, but the secondary CPUs were loading them from the uninitialized state. This adds the necessary save-state call. Signed-off-by: Paul Mackerras commit a7f290dad32ee34d931561b7943c858fe2aae503 Author: Benjamin Herrenschmidt Date: Fri Nov 11 21:15:21 2005 +1100 [PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel This patch moves the vdso's to arch/powerpc, adds support for the 32 bits vdso to the 32 bits kernel, rename systemcfg (finally !), and adds some new (still untested) routines to both vdso's: clock_gettime() with support for CLOCK_REALTIME and CLOCK_MONOTONIC, clock_getres() (same clocks) and get_tbfreq() for glibc to retreive the timebase frequency. Tom,Steve: The implementation of get_tbfreq() I've done for 32 bits returns a long long (r3, r4) not a long. This is such that if we ever add support for >4Ghz timebases on ppc32, the userland interface won't have to change. I have tested gettimeofday() using some glibc patches in both ppc32 and ppc64 kernels using 32 bits userland (I haven't had a chance to test a 64 bits userland yet, but the implementation didn't change and was tested earlier). I haven't tested yet the new functions. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6761c4a07378e19e3710bb69cea65795774529b1 Author: David Woodhouse Date: Fri Nov 11 08:07:11 2005 +0000 [PATCH] powerpc: remove initrd debug printk This removes a stray debugging printk which offended Anton. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 35cd8785de39c90a52287d0f041cff8a792eaa74 Author: David Gibson Date: Fri Nov 11 16:42:12 2005 +1100 [PATCH] powerpc: Move udbg code to arch/powerpc Since the udbg code in ppc64 has no ppc32 equivalent, move it straight over into arch/powerpc (and include/asm-powerpc for udbg.h). In time, we probably want to meld the various bits and pieces of 32-bit early debugging code into udbg, but for now only include it on CONFIG_PPC64=y builds. The only change during the move is to standardise the protecting #ifdef/#define in udbg.h, and move its banner comment above the initial #ifdef (which seems to be normal practice). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built for 32bit multiplatform (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit a7df61a0e2b6300d8b8349c1e5e87a4336c0ab38 Author: Anton Blanchard Date: Fri Nov 11 15:02:03 2005 +1100 [PATCH] ppc64: Increase sparsemem defaults The definitions in sparsemem.h arent sufficient. We currently sell machines with 2TB of RAM, and in order to give us room for a few years growth lets set it to 16TB. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 45fb6cea09443b2066016f895937f9c2647a1507 Author: Anton Blanchard Date: Fri Nov 11 14:22:35 2005 +1100 [PATCH] ppc64: Convert NUMA to sparsemem (3) Convert to sparsemem and remove all the discontigmem code in the process. This has a few advantages: - The old numa_memory_lookup_table can go away - All the arch specific discontigmem magic can go away We also remove the triple pass of memory properties and instead create a list of per node extents that we iterate through. A final cleanup would be to change our lmb code to store extents per node, then we can reuse that information in the numa code. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3e66c4def14aa64ee6d1d4ef077d789abc30125d Author: Anton Blanchard Date: Fri Nov 11 14:13:20 2005 +1100 [PATCH] ppc64: prep for NUMA sparsemem rework 2 Remove ppc64 specific version of nr_cpus_node and use the generic one provided. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit c0d33403ad39f4e945dd5b3febe5c1f94a9a1d29 Author: Anton Blanchard Date: Fri Nov 11 14:12:26 2005 +1100 [PATCH] ppc64: prep for NUMA sparsemem rework Remove an unused numa define and move a discontigmem specific define inside the relevant ifdef. I will submit a separate patch to remove them from other architectures, but the ppc64 patches to follow depend on this. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 1dff227e0184de3d1f12265dff0c47d86dad2eec Author: Anton Blanchard Date: Fri Nov 11 14:07:20 2005 +1100 [PATCH] ppc64: Cleanup kprobe assembly The kprobes code is doing ".previous .text". While the assembler doesnt warn at the moment (and it seems to work), it might in the future. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 50bcfec19fcdf3aa936547bad5dee02062917d04 Author: Anton Blanchard Date: Fri Nov 11 13:56:16 2005 +1100 [PATCH] ppc64: Remove debug boot message We have been printing the raw ppc64_firmware_features during boot. Since we can work it out from the device tree, lets remove it. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8acb888c9cf70d03598eb4a731e3c6e5a588f1ce Author: Anton Blanchard Date: Fri Nov 11 13:53:11 2005 +1100 [PATCH] ppc64: Quieten lparcfg If we dont have permission to read some information from the hypervisor, lparcfg outputs a warning on the console. Now that lparcfg is world readable this is a problem. Dont warn in the case of H_Authority, remove some unnecessary function prototypes and fix whitespace damage in a structure as well. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 7f7fda04a6a00d2b99990cec2182bf5181c53de1 Author: Kumar Gala Date: Thu Nov 10 10:34:33 2005 -0600 [PATCH] ppc32: fix PQ2 PCI DMA interrupt handling The bit position in the status register corresponding to the PCI DMA interrupt was incorrect. Additionally, we did not have a define for the PCI DMA interrupt. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 Author: Andrew Morton Date: Thu Nov 10 16:21:38 2005 -0800 [PATCH] libata.h needs dma-mapping.h On Alpha: include/linux/libata.h: In function `ata_pad_alloc': include/linux/libata.h:785: warning: implicit declaration of function `dma_alloc_coherent' include/linux/libata.h:786: warning: assignment makes pointer from integer without a cast include/linux/libata.h: In function `ata_pad_free': include/linux/libata.h:792: warning: implicit declaration of function `dma_free_coherent' (I have a decouple-some-header-files cleanup in -mm, so it's causing some fallout of this nature) Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6af37fa9928a0d50cda1bad14b2eda8c1a4d1a0e Author: Anton Blanchard Date: Fri Nov 11 14:02:04 2005 +1100 [PATCH] disable DEBUG in ibmveth At the moment ibmveth has DEBUG enabled which is rather verbose. Disable it. Signed-off-by: Anton Blanchard Signed-off-by: Jeff Garzik commit a5cf8b7dc5ae69c65ef366325dfc1abb507276c7 Author: Jeff Garzik Date: Thu Nov 10 20:34:12 2005 -0500 [PATCH] lpfc build fix Current upstream 'allmodconfig' build is broken. This is the obvious patch... Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit a5aac37f1cdbbd1e587fc618e778ddae124e5ac3 Author: Andrew Morton Date: Thu Nov 10 21:14:16 2005 -0800 [SPARC]: display7seg build fix Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1b397f4f1c167dbf06397b3182fca521c00125c4 Author: Steve French Date: Thu Nov 10 19:36:39 2005 -0800 [CIFS] Fix spaces in cifs kconfig entry Signed-off-by: Steve French commit 69114089b75e039f531a3cb9e5e9d8c610679320 Author: Steve French Date: Thu Nov 10 19:28:44 2005 -0800 [CIFS] Reduce sparse endian warnings Signed-off-by: Steve French commit 3c50c61826d1e2e9354232f625216c8fcfef48db Author: Steve French Date: Thu Nov 10 17:31:33 2005 -0800 [CIFS] Update CIFS change log Signed-off-by: Steve French commit 6a438bbe68c7013a42d9c5aee5a40d7dafdbe6ec Author: Stephen Hemminger Date: Thu Nov 10 17:14:59 2005 -0800 [TCP]: speed up SACK processing Use "hints" to speed up the SACK processing. Various forms of this have been used by TCP developers (Web100, STCP, BIC) to avoid the 2x linear search of outstanding segments. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit caa20d9abe810be2ede9612b6c9db6ce7d6edf80 Author: Stephen Hemminger Date: Thu Nov 10 17:13:47 2005 -0800 [TCP]: spelling fixes Minor spelling fixes for TCP code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 326f36e9e7de362e09745ce6f84b65e7ccac33ba Author: John Heffner Date: Thu Nov 10 17:11:48 2005 -0800 [TCP]: receive buffer growth limiting with mixed MTU This is a patch for discussion addressing some receive buffer growing issues. This is partially related to the thread "Possible BUG in IPv4 TCP window handling..." last week. Specifically it addresses the problem of an interaction between rcvbuf moderation (receiver autotuning) and rcv_ssthresh. The problem occurs when sending small packets to a receiver with a larger MTU. (A very common case I have is a host with a 1500 byte MTU sending to a host with a 9k MTU.) In such a case, the rcv_ssthresh code is targeting a window size corresponding to filling up the current rcvbuf, not taking into account that the new rcvbuf moderation may increase the rcvbuf size. One hunk makes rcv_ssthresh use tcp_rmem[2] as the size target rather than rcvbuf. The other changes the behavior when it overflows its memory bounds with in-order data so that it tries to grow rcvbuf (the same as with out-of-order data). These changes should help my problem of mixed MTUs, and should also help the case from last week's thread I think. (In both cases though you still need tcp_rmem[2] to be set much larger than the TCP window.) One question is if this is too aggressive at trying to increase rcvbuf if it's under memory stress. Orignally-from: John Heffner Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9772efb970780aeed488c19d8b4afd46c3b484af Author: Stephen Hemminger Date: Thu Nov 10 17:09:53 2005 -0800 [TCP]: Appropriate Byte Count support This is an updated version of the RFC3465 ABC patch originally for Linux 2.6.11-rc4 by Yee-Ting Li. ABC is a way of counting bytes ack'd rather than packets when updating congestion control. The orignal ABC described in the RFC applied to a Reno style algorithm. For advanced congestion control there is little change after leaving slow start. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7faffa1c7fb9b8e8917e3225d4e2638270c0a48b Author: Stephen Hemminger Date: Thu Nov 10 17:07:24 2005 -0800 [TCP]: add tcp_slow_start helper Move all the code that does linear TCP slowstart to one inline function to ease later patch to add ABC support. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2d2abbab63f6726a147ae61ada39bf2c9ee0db9a Author: Stephen Hemminger Date: Thu Nov 10 16:56:12 2005 -0800 [TCP]: simplify microsecond rtt sampling Simplify the code that comuputes microsecond rtt estimate used by TCP Vegas. Move the callback out of the RTT sampler and into the end of the ack cleanup. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f4805eded7d38c4e42bf473dc5eb2f34853beb06 Author: Stephen Hemminger Date: Thu Nov 10 16:53:30 2005 -0800 [TCP]: fix congestion window update when using TSO deferal TCP peformance with TSO over networks with delay is awful. On a 100Mbit link with 150ms delay, we get 4Mbits/sec with TSO and 50Mbits/sec without TSO. The problem is with TSO, we intentionally do not keep the maximum number of packets in flight to fill the window, we hold out to until we can send a MSS chunk. But, we also don't update the congestion window unless we have filled, as per RFC2861. This patch replaces the check for the congestion window being full with something smarter that accounts for TSO. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6e6ece5dc6022e8086c565498d23511bbceda811 Author: Jesse Barnes Date: Tue Nov 8 20:13:02 2005 -0800 [PATCH] PCI: fix for Toshiba ohci1394 quirk After much testing and agony, I've discovered that my previous ohci1394 quirk for Toshiba laptops is not 100% reliable. It apparently fails to do the interrupt line change either correctly or in time, since in about 2 out of 5 boots, the kernel's irqdebug code will *still* disable irq 11 when the ohci1394 driver is loaded (at pci_enable_device time I think). This patch switches things around a little in the workaround. First, it removes the mdelay. I didn't see a need for it and my testing has shown that it's not necessary for the quirk to work. Secondly, instead of trying to change the interrupt line to what ACPI tells us it should be, this patch makes the quirk use the value in the PCI_INTERRUPT_LINE register. On this laptop at least, that seems to be the right thing to do, though additional testing on other laptops and/or with actual firewire devices would be appreciated. Signed-off-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman commit 6560aa5c430fd8a7002b6e7abc1ee6c42521b06b Author: Rajesh Shah Date: Mon Nov 7 13:37:36 2005 -0800 [PATCH] PCI: fix namespace clashes Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit b4033c1715cb5aa1dcb1a25bdaf71fea908bb3f1 Author: Ashok Raj Date: Tue Nov 8 21:42:33 2005 -0800 [PATCH] PCI: Change MSI to use physical delivery mode always MSI hardcoded delivery mode to use logical delivery mode. Recently x86_64 moved to use physical mode addressing to support physflat mode. With this mode enabled noticed that my eth with MSI werent working. msi_address_init() was hardcoded to use logical mode for i386 and x86_64. So when we switch to use physical mode, things stopped working. Since anyway we dont use lowest priority delivery with MSI, its always directed to just a single CPU. Its safe and simpler to use physical mode always, even when we use logical delivery mode for IPI's or other ioapic RTE's. Signed-off-by: Ashok Raj Signed-off-by: Greg Kroah-Hartman commit 48b19148733b4826eeedfd8be9f19b61c8d010b1 Author: Adrian Bunk Date: Sun Nov 6 01:45:08 2005 +0100 [PATCH] PCI: drivers/pci/: small cleanups This patch contains the following cleanups: - access.c should #include "pci.h" for getting the prototypes of it's global functions - hotplug/shpchp_pci.c: make the needlessly global function program_fw_provided_values() static Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 26205e026cf2b3bb039d6169978ae520973f4141 Author: Grant Coady Date: Sun Nov 6 10:52:51 2005 +1100 [PATCH] pci_ids cleanup: fix two additional IDs in bt87x pci_ids cleanup: fixup bt87x.c: two macro defined IDs missed in prior cleanup. Caught by Chun-Chung Chen : "In the patch for bt87x.c, you seemed have missed the two occurrences of BT_DEVICE on line 897 and line 898." Signed-off-by: Grant Coady Signed-off-by: Greg Kroah-Hartman commit 5fa80fcdca9d20d30c9ecec30d4dbff4ed93a5c6 Author: John Rose Date: Fri Nov 4 15:38:50 2005 -0600 [PATCH] dlpar regression for ppc64 - probe change This patch contains the driver bits for enabling DLPAR and PCI Hotplug for the new OF-based PCI probe. This functionality was regressed when the new PCI approach was introduced. Please apply if appropriate. Signed-off-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 249bb070f5e821503c1118e1e87c0ccb1432d191 Author: Greg Kroah-Hartman Date: Fri Nov 4 18:56:13 2005 -0800 [PATCH] PCI: removed unneeded .owner field from struct pci_driver Signed-off-by: Greg Kroah-Hartman commit 863b18f4b5e7d9e6903b353328cf6fa084dbb619 Author: Laurent riffard Date: Thu Oct 27 23:12:54 2005 +0200 [PATCH] PCI: automatically set device_driver.owner A nice feature of sysfs is that it can create the symlink from the driver to the module that is contained in it. It requires that the device_driver.owner is set, what is not the case for many PCI drivers. This patch allows pci_register_driver to set automatically the device_driver.owner for any PCI driver. Credits to Al Viro who suggested the method. Signed-off-by: Laurent Riffard Signed-off-by: Greg Kroah-Hartman -- drivers/ide/setup-pci.c | 12 +++++++----- drivers/pci/pci-driver.c | 9 +++++---- include/linux/ide.h | 3 ++- include/linux/pci.h | 10 ++++++++-- 4 files changed, 22 insertions(+), 12 deletions(-) commit f8eb1005a5bdb019d2a4ff3ef8d8e8015b22afcb Author: Randy Dunlap Date: Fri Oct 28 20:36:51 2005 -0700 [PATCH] pci-driver: store_new_id() not inline store_new_id() should not be (and cannot be) inline; the function pointer is stored in a device_attribute table. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit a5312e28c195f6118ba52fb8abe17cf2efc6a427 Author: Ivan Kokshaysky Date: Tue Nov 1 01:43:56 2005 +0300 [PATCH] PCI: NCR 53c810 quirk Move the PPC fixup for old NCR 810 controllers to generic quirks - it's needed for Alpha, x86 and other architectures that use setup-bus.c. Thanks to Jay Estabrook for pointing out the issue. Signed-off-by: Ivan Kokshaysky Signed-off-by: Greg Kroah-Hartman commit 02f313b2cc5d8273e3f2ffa23fc72392b2174cef Author: Meelis Roos Date: Sat Oct 29 13:31:49 2005 +0300 [PATCH] PCI: Fix VIA 686 PCI quirk names The quirk names for VIA 686 are mistyped in 2.6.14 (686 vs 868). S3 868 influence? :) Here is a patch to correct them. Signed-off-by: Meelis Roos Signed-off-by: Greg Kroah-Hartman commit 8239def1b56e0c0c8e0fd3754a12df3d60a64ed7 Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:13 2005 -0800 [PATCH] pciehp: fix handling of power faults during hotplug The current pciehp implementation reports a power-fail error even if the condition has cleared by the time the corresponding interrupt handling code gets a chance to run. This patch fixes this problem. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit a3a45ec8f8edaf088449e37fe81c99cbf580b9bd Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:12 2005 -0800 [PATCH] pciehp: clean-up how we request control of hotplug hardware This patch further tweaks how we request control of hotplug controller hardware from BIOS. We first search the ACPI namespace corresponding to a specific hotplug controller looking for an _OSC or OSHP method. On failure, we successively move to the ACPI parent object, till we hit the highest level host bridge in the hierarchy. This allows for different types of BIOS's which place the _OSC/OSHP methods at various places in the acpi namespace, while still not encroaching on the namespace of some other root level host bridge. This patch also introduces a new load time option (pciehp_force) that allows us to bypass all _OSC/OSHP checking. Not supporting these methods seems to be be the most common ACPI firmware problem we've run into. This will still _not_ allow the pciehp driver to work correctly if the BIOS really doesn't support pciehp (i.e. if it doesn't generate a hotplug interrupt). Use this option with caution. Some BIOS's may deliberately not build any _OSC/OSHP methods to make sure it retains control the hotplug hardware. Using the pciehp_force parameter for such systems can lead to two separate entities trying to control the same hardware. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 427bf532b5ad6db5addc2bce675d13f874397c0c Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:11 2005 -0800 [PATCH] pciehp: request control of each hotplug controller individually This patch tweaks the way pciehp requests control of the hotplug hardware from BIOS. It now tries to invoke the ACPI _OSC method for a specific hotplug controller only, rather than walking the entire acpi namespace invoking all possible _OSC methods under all host bridges. This allows us to gain control of each hotplug controller individually, even if BIOS fails to give us control of some other hotplug controller in the system. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 1a9ed1bfe2fb17cc30227a12a3c1212128bb78b6 Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:10 2005 -0800 [PATCH] pciehp: reduce debug message verbosity Reduce the number of debug messages generated if pciehp debug is enabled. I tried to restrict this to removing debug messages that are either early-driver-debug type messages, or print information that can be inferred through other debug prints. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit ed6cbcf2ac706aa47194fd2f7a99865cc06833d7 Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:09 2005 -0800 [PATCH] pciehp: miscellaneous cleanups Remove un-necessary header includes, remove dead code, remove some hardcoded constants... Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit ca22a5e4d70620b7f3d809e424daa5214b0aa00d Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:08 2005 -0800 [PATCH] pciehp: remove redundant data structures State information is currently stored in per-slot as well as per-pci-function data structures in pciehp. There's a lot of overlap in the information kept, and some of it is never used. This patch consolidates the state information to per-slot and eliminates unused data structures. The biggest change is to eliminate the pci_func structure and the code around managing its lists. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit a8a2be949267cb0d1d933a92d9fb43eda4f4fe88 Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:07 2005 -0800 [PATCH] pciehp: reduce dependence on ACPI Reduce the PCI Express hotplug driver's dependence on ACPI. We don't walk the acpi namespace anymore to build a list of bridges and devices. We go to ACPI only to run the _OSC or _OSHP methods to transition control of hotplug hardware from system BIOS to the hotplug driver, and to run the _HPP method to get hotplug device parameters like cache line size, latency timer and SERR/PERR enable from BIOS. Note that one of the side effects of this patch is that pciehp does not automatically enable the hot-added device or its DMA bus mastering capability now. It expects the device driver to do that. This may break some drivers and we will have to fix them as they are reported. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 71b720c0f96145f5868c87591c286b290bc1a6af Author: rajesh.shah@intel.com Date: Mon Oct 31 16:20:06 2005 -0800 [PATCH] patch 1/8] pciehp: use the PCI core for hotplug resource management This patch converts the pci express hotplug controller driver to use the PCI core for resource management. This eliminates a lot of duplicated code and integrates pciehp with the system's normal PCI handling code. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 24a4e377068d15424cd6a921d41352f295548037 Author: Roland Dreier Date: Fri Oct 28 17:35:34 2005 -0700 [PATCH] PCI: add pci_find_next_capability() Some devices have more than one capability of the same type. For example, the PCI header for the PathScale InfiniPath looks like: 04:01.0 InfiniBand: Unknown device 1fc1:000d (rev 02) Subsystem: Unknown device 1fc1:000d Flags: bus master, fast devsel, latency 0, IRQ 193 Memory at fea00000 (64-bit, non-prefetchable) [size=2M] Capabilities: [c0] HyperTransport: Slave or Primary Interface Capabilities: [f8] HyperTransport: Interrupt Discovery and Configuration There are _two_ HyperTransport capabilities, and the PathScale driver wants to look at both of them. The current pci_find_capability() API doesn't work for this, since it only allows us to get to the first capability of a given type. The patch below introduces a new pci_find_next_capability(), which can be used in a loop like for (pos = pci_find_capability(pdev, ); pos; pos = pci_find_next_capability(pdev, pos, )) { /* ... */ } Signed-off-by: Roland Dreier Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit a2653ebab3a96c6e6183360821faa492c1f88c3f Author: Steve French Date: Thu Nov 10 15:33:38 2005 -0800 [CIFS] Reserve upcall IDX value for CIFS with connector header and add Kconfig option for CIFS upcall. Signed-off-by: Steve French commit 6b482c6779daaa893b277fc9b70767a7c2e7c5eb Author: Dave Jones Date: Thu Nov 10 15:45:56 2005 -0500 [PATCH] Don't print per-cpu vm stats for offline cpus. I just hit a page allocation error on a kernel configured to support 64 CPUs. It spewed 60 completely useless unnecessary lines of info. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit f3b84ec2a67bbfbe44cf907203ee99b23b38fc30 Author: Ian McDonald Date: Thu Nov 10 13:05:01 2005 -0800 [DCCP]: Alter website for DCCP in MAINTAINERS Website for DCCP is now hosted at OSDL Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit 98069ff4ec9c73a03e6c61dbb17f8e5a0b85ef6e Author: Ian McDonald Date: Thu Nov 10 13:04:33 2005 -0800 [DCCP]: Create Documentation/networking/dccp.txt This patch is a first go at some documentation. Please advise if gmail has mangled patch and I will revert to an attachment: Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit ac57d04267383829ce817e522e4ebbb39f50ae75 Author: Pavel Roskin Date: Thu Nov 10 13:03:08 2005 -0800 [NET]: Annotate h_proto in struct ethhdr The protocol field in ethernet headers is big-endian and should be annotated as such. This patch allows detection of missing ntohs() calls on the ethernet protocol field when sparse is run with __CHECK_ENDIAN__ defined. This is a revised version that includes so that the userspace programs are not confused by __be16. Thanks to David S. Miller. Signed-off-by: Pavel Roskin Signed-off-by: David S. Miller commit fb286bb2990a107009dbf25f6ffebeb7df77f9be Author: Herbert Xu Date: Thu Nov 10 13:01:24 2005 -0800 [NET]: Detect hardware rx checksum faults correctly Here is the patch that introduces the generic skb_checksum_complete which also checks for hardware RX checksum faults. If that happens, it'll call netdev_rx_csum_fault which currently prints out a stack trace with the device name. In future it can turn off RX checksum. I've converted every spot under net/ that does RX checksum checks to use skb_checksum_complete or __skb_checksum_complete with the exceptions of: * Those places where checksums are done bit by bit. These will call netdev_rx_csum_fault directly. * The following have not been completely checked/converted: ipmr ip_vs netfilter dccp This patch is based on patches and suggestions from Stephen Hemminger and David S. Miller. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 1064e944d03eb7a72c0fa11236d5e69cfd877a71 Author: John W. Linville Date: Thu Nov 10 12:58:24 2005 -0800 [BNX2]: simplify parameter checks in bnx2_{get,set}_eeprom Remove the superfluous parameter checking in bnx2_{get,set}_eeprom. The parameters are already validated in ethtool_{get,set}_eeprom. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit b6cbc3b6fe588c0ea1341d10413e12c2a96a6032 Author: John W. Linville Date: Thu Nov 10 12:58:00 2005 -0800 [BNX2]: check return of dev_alloc_skb in bnx2_test_loopback Check return of dev_alloc_skb in bnx2_test_loopback, and handle appropriately. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 2f23c523f32324e5b5f39565cbcb0a8ff8923019 Author: John W. Linville Date: Thu Nov 10 12:57:33 2005 -0800 [BNX2]: output driver name as prefix in error message Output driver name as prefix to "Unknown flash/EEPROM type." message. Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit b925556cc9e82b32ab68a7620b247f47193501a7 Author: Dave Jones Date: Thu Nov 10 12:55:52 2005 -0800 [ATM]: [horizon] fix sparse warnings Signed-off-by: Dave Jones Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit e623a3b8086208eb118d9501b8bfb3e656e754d4 Author: Zachary Amsden Date: Mon Nov 7 15:27:51 2005 -0800 [PATCH] kbuild: build breaks after -imacros was introduced I have to revert the recent addition of -imacros to the Makefile to get my tool chain to build. Without the change, below, I get: Note that this looks entirely like a toolchain bug. Here is the offending command: [pid 12163] execve("/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0", ["/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0", "-lang-asm", "-nostdinc", "-Iinclude", "-Iinclude/asm-i386/mach-default", "-D__GNUC__=3", "-D__GNUC_MINOR__=2", "-D__GNUC_PATCHLEVEL__=2", "-D__GXX_ABI_VERSION=102", "-D__ELF__", "-Dunix", "-D__gnu_linux__", "-Dlinux", "-D__ELF__", "-D__unix__", "-D__gnu_linux__", "-D__linux__", "-D__unix", "-D__linux", "-Asystem=posix", "-D__NO_INLINE__", "-D__STDC_HOSTED__=1", "-Acpu=i386", "-Amachine=i386", "-Di386", "-D__i386", "-D__i386__", "-D__tune_i386__", "-D__KERNEL__", "-D__ASSEMBLY__", "-isystem", "/usr/lib/gcc-lib/i386-redhat-linux/3.2.2/include", "-imacros", "include/linux/autoconf.h", "-MD", "arch/i386/kernel/.entry.o.d", "arch/i386/kernel/entry.S", "-o", "/tmp/ccOlsFJR.s"] Which should execute properly, I think. But it does not: zach-dev:linux-2.6.14-zach-work $ make CHK include/linux/version.h CHK include/linux/compile.h CHK usr/initramfs_list AS arch/i386/kernel/entry.o /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/tradcpp0: output filename specified twice make[1]: *** [arch/i386/kernel/entry.o] Error 1 make: *** [arch/i386/kernel] Error 2 gcc (GCC) 3.2.2 20030222 (Red Hat Linux 3.2.2-5) Deprecating the -imacros fixes the build for me. It does not appear to be a simple argument overflow problem in trapcpp0, since deprecating all the defines reproduces the problem as well. Also, switching -imacros to -include fixes the problem. Signed-off-by: Zachary Amsden Signed-off-by: Sam Ravnborg commit 393b07258766130146b962bc294d66615a47468a Author: David S. Miller Date: Thu Nov 10 12:47:50 2005 -0800 [SPARC64]: Re-export uts_sem for solaris compat module. Revert: b26b9bc58263acda274f82a9dde8b6d96559878a Signed-off-by: David S. Miller commit 780d09e895032207a6b070a44d392a3c60574b70 Author: Dean Nelson Date: Wed Nov 9 14:41:57 2005 -0600 [IA64] utilize notify_die() for XPC disengage XPC (as in arch/ia64/sn/kernel/xp*) has a need to notify other partitions (SGI Altix) whenever a partition is going down in order to get them to disengage from accessing the halting partition's memory. If this is not done before the reset of the hardware, the other partitions can find themselves encountering MCAs that bring them down. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit baf47fb66020e5c3fe2386680fa2d79d1f8e0052 Author: Panagiotis Issaris Date: Wed Nov 9 02:08:42 2005 +0100 [IA64] Replace kcalloc(1, with kzalloc. Conversion from kcalloc(1, to kzalloc. Signed-off-by: Panagiotis Issaris Signed-off-by: Tony Luck commit 94382f3562e350ed7c8f7dcd6fc968bdece31328 Author: Roland Dreier Date: Thu Nov 10 10:18:23 2005 -0800 [IB] umad: further ib_unregister_mad_agent() deadlock fixes The previous umad deadlock fix left ib_umad_kill_port() still vulnerable to deadlocking. This patch fixes that by downgrading our lock to a read lock when we might end up trying to reacquire the lock for reading. Signed-off-by: Roland Dreier commit ae57e24a4006fd46b73d842ee99db9580ef74a02 Author: Michael S. Tsirkin Date: Wed Nov 9 14:59:57 2005 -0800 [IB] mthca: fix posting long lists of receive work requests In Tavor mode, when posting a long list of receive work requests, a doorbell must be rung every 256 requests. Add code to do this when required. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 64044bcf75063cb5a6d42712886a712449df2ce3 Author: Roland Dreier Date: Wed Nov 9 12:23:17 2005 -0800 [IB] mthca: fix wraparound handling in mthca_cq_clean() Handle case where prod_index has wrapped around and become less than cq->cons_index by checking that their difference as a signed int is positive rather than comparing directly. Signed-off-by: Roland Dreier commit 62abb8416f1923f4cef50ce9ce841b919275e3fb Author: Michael S. Tsirkin Date: Wed Nov 9 11:30:14 2005 -0800 [IB] mthca: fix posting of atomic operations The size of work requests for atomic operations was computed incorrectly in mthca: all sizeofs need to be divided by 16. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 77369ed31daac51f4827c50d30f233c45480235a Author: Jack Morgenstein Date: Wed Nov 9 11:26:07 2005 -0800 [IB] uverbs: have kernel return QP capabilities Move the computation of QP capabilities (max scatter/gather entries, max inline data, etc) into the kernel, and have the uverbs module return the values as part of the create QP response. This keeps precise knowledge of device limits in the low-level kernel driver. This requires an ABI bump, so while we're making changes, get rid of the max_sge parameter for the modify SRQ command -- it's not used and shouldn't be there. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit ec914c52d6208d8752dfd85b48a9aff304911434 Author: Roland Dreier Date: Wed Nov 9 09:58:10 2005 -0800 [IB] umad: get rid of unused mr array Now that ib_umad uses the new MAD sending interface, it no longer needs its own L_Key. So just delete the array of MRs that it keeps. Signed-off-by: Roland Dreier commit 40de2e548c225e3ef859e3c60de9785e37e1b5b1 Author: Roland Dreier Date: Tue Nov 8 11:10:25 2005 -0800 [IB] Have cq_resize() method take an int, not int* Change the struct ib_device.resize_cq() method to take a plain integer that holds the new CQ size, rather than a pointer to an integer that it uses to return the new size. This makes the interface match the exported ib_resize_cq() signature, and allows the low-level driver to update the CQ size with proper locking if necessary. No in-tree drivers are exporting this method yet. Signed-off-by: Roland Dreier commit 0b4ff2c0e624089ad87dc1604e239b7c3201c53f Author: Roland Dreier Date: Mon Nov 7 22:01:02 2005 -0800 [IB] mthca: fix typo in catastrophic error polling Fix a typo in the rearming of the catastrophic error polling timer: we should rearm the timer as long as the stop flag is _not_ set. Signed-off-by: Roland Dreier commit 8c608a32e3cd7ff14498ad996ca32d1452245a97 Author: Roland Dreier Date: Mon Nov 7 10:49:38 2005 -0800 [IPoIB] no need to set skb->dev right before freeing skb For cut-and-paste reasons, the IPoIB driver was setting skb->dev right before calling dev_kfree_skb_any(). Get rid of this. Signed-off-by: Roland Dreier commit 2f76e82947b977a1008cfd2868351a701c93c69c Author: Roland Dreier Date: Mon Nov 7 10:41:29 2005 -0800 [IB] umad: avoid potential deadlock when unregistering MAD agents ib_unregister_mad_agent() completes all pending MAD sends and waits for the agent's send_handler routine to return. umad's send_handler() calls queue_packet(), which does down_read() on the port mutex to look up the agent ID. This means that the port mutex cannot be held for writing while calling ib_unregister_mad_agent(), or else it will deadlock. This patch fixes all the calls to ib_unregister_mad_agent() in the umad module to avoid this deadlock. Signed-off-by: Roland Dreier commit 1732b0ef3b3a02e3df328086fb3018741c5476da Author: Roland Dreier Date: Mon Nov 7 10:33:11 2005 -0800 [IPoIB] add path record information in debugfs Add ibX_path files to debugfs that contain information about the IPoIB path cache. IPoIB ARP only gives GIDs, which the IPoIB driver must resolve to real IB paths through the ib_sa module. For debugging, when the ARP table looks OK but traffic isn't flowing, it's useful to be able to see if the resolution from GID to path worked. Also clean up the formatting of the existing _mcg debugfs files. Signed-off-by: Roland Dreier commit 7ed0175a462c4c30f6df6fac1cccac058f997739 Author: Oleg Nesterov Date: Thu Nov 10 17:22:18 2005 +0300 [PATCH] Don't auto-reap traced children If a task is being traced we never auto-reap it even if it might look like its parent doesn't care. The tracer obviously _does_ care. Signed-off-by: Linus Torvalds commit b216c01829d0b73a468204e2e763c0a818b77a46 Author: Liam Girdwood Date: Thu Nov 10 17:45:39 2005 +0000 [ARM] 3098/1: pxa2xx disable ssp irq Patch from Liam Girdwood This patch allows users of the pxa SSP driver to register their own irq handlers instead of using the default SSP handler. It also cleans up the CKEN clock and irq detection as the values are now stored in a table. This patch replaces 2845/1 Changes:- o Added flags parameter to ssp_init() o Added SSP_NO_IRQ flag to disable registering of ssp irq handler (for drivers that want to register their own handler) o Cleaned up clock and irq detection, values are now stored in table. o Added build changes to allow other drivers (e.g audio) to select the ssp driver. o corgi_ssp.c changed to use new interface. Signed-off-by: Liam Girdwood Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 078abcf95cdb95c78d786dbc61ae3c22ee70fb61 Author: Richard Purdie Date: Thu Nov 10 17:42:29 2005 +0000 [ARM] 3096/1: Add SharpSL Zaurus power and battery management core driver Patch from Richard Purdie This patch adds a power and battery management core driver which with the addition of the right device files, supports the c7x0 and cxx00 series of Sharp Zaurus handhelds. The driver is complex for several reasons. Battery charging is manually monitored and controlled. When suspended, the device needs to periodically partially resume, check the charging status and then re-suspend. It does without bothering the higher linux layers as a full resume and re-suspend is unnecessary. The code is carefully written to avoid interrupts or calling code outside the module under these circumstances. It also vets the various wake up sources and monitors the device's power situation. Hooks to limit the backlight intensity and to notify the battery monitoring code of backlight events are connected/added as the backlight is one of the biggest users of power on the device. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 3b7d697dfb7d03edb87e50b743a7ecff029618e9 Author: Jeff Garzik Date: Thu Nov 10 11:04:11 2005 -0500 [libata] constify PCI ID table in several drivers commit b1faebb672edecf48d4745fb05eeca3c704b6823 Author: Tony Lindgren Date: Thu Nov 10 14:26:54 2005 +0000 [ARM] 3144/1: OMAP 5/5: Update omap H2 defconfig Patch from Tony Lindgren This patch updates omap H2 defconfig. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 9ad5897c2659b3c610e0c717e8b3dbfb496d2c74 Author: Tony Lindgren Date: Thu Nov 10 14:26:53 2005 +0000 [ARM] 3143/1: OMAP 4/5: Update omap include files Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. This patch contains changes to common header files for omap1xxx and omap24xx by various omap developers, and improved cpu detection by Imre Deak Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 046d6b28ebce92aab2865aa3eb3a0d8ede57e17e Author: Tony Lindgren Date: Thu Nov 10 14:26:52 2005 +0000 [ARM] 3146/1: OMAP 3b/5: Add omap24xx clock framework Patch from Tony Lindgren This patch adds omap24xx specific clock code by Richard Woodruff, Nishant Menon, Tony Lindgren et al. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 1dbae815a724303b46ab4663b5fc23c13e9d9690 Author: Tony Lindgren Date: Thu Nov 10 14:26:51 2005 +0000 [ARM] 3145/1: OMAP 3a/5: Add support for omap24xx Patch from Tony Lindgren This patch adds support for omap24xx series of processors. The files live in arch/arm/mach-omap2, and share common files with omap15xx and omap16xx processors in arch/arm/plat-omap. Omap24xx support was originally added for 2.6.9 by TI. This code was then improved and integrated to share common code with omap15xx and omap16xx processors by various omap developers, such as Paul Mundt, Juha Yrjola, Imre Deak, Tony Lindgren, Richard Woodruff, Nishant Menon, Komal Shah et al. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 1a8bfa1eb998af6e650ad26201f7cae9f2a2fdc8 Author: Tony Lindgren Date: Thu Nov 10 14:26:50 2005 +0000 [ARM] 3142/1: OMAP 2/5: Update files common to omap1 and omap2 Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Serial port and framebuffer init improvments by Imre Deak - Common omap pin mux framework by Tony Lindgren - Common omap clock framework by Tony Lindren Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 3179a019391f0f8081245fd564a5f1be308ba64f Author: Tony Lindgren Date: Thu Nov 10 14:26:48 2005 +0000 [ARM] 3141/1: OMAP 1/5: Update omap1 specific files Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Omap1 serial pport and framebuffer init updates by Imre Deak - Add support for omap310 processor and Palm Tungsten E PDA by Laurent Gonzales, Romain Goyet, et al. Omap310 and omap1510 processors are now handled as omap15xx. - Omap1 specific changes to shared omap clock framework by Tony Lindgren - Omap1 specific changes to shared omap pin mux framework by Tony Lindgren - Other misc fixes, such as update memory timings for smc91x, omap1 specific device initialization etc. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit a7918f39bbe59fe76f43743bdb6bb8b0bdefd94a Author: Alessandro Zummo Date: Thu Nov 10 14:05:04 2005 +0000 [ARM] 3140/1: NSLU2 machine support Patch from Alessandro Zummo This patch adds support for the LinkSys NSLU2 running with both big and little-endian kernels. The LinkSys NSLU2 is a cost engineered ARM, XScale 420 based system similar to the the Intel IXDP425 evaluation board. It uses the IXP4XX ARCH. While this patch applies independently of other patches the resultant kernel requires further patches to successfully use onboard devices, including the onboard flash. Since these patches are independent of this one they will be submitted separately. A defconfig is not included here because not all of the required drivers are actually in the kernel. We intend to provide one as soon as the patches will be incorporated in mainstream. This patch is the combined work of nslu2-linux.org Signed-off-by: John Bowler Signed-off-by: Alessandro Zummo Signed-off-by: Deepak Saxena Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit f51750d5eab50f0db5396a5ca30d5bafc038c263 Author: Alan Cox Date: Mon Nov 7 17:06:33 2005 +0000 [PATCH] libata: Note a nasty ATA quirk Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit af36bef0c5bb82f361ebb2f106f11d0f63dac887 Author: Russell King Date: Thu Nov 10 11:40:53 2005 +0000 [ARM] Fix csumpartial corner case Ji-In Park discovered a bug in csumpartial which caused wrong checksums with misaligned buffers. Signed-off-by: Russell King commit a2932b35a0efd01b20a3f598d19db052d64935f5 Author: Igor Popik Date: Thu Oct 6 20:32:58 2005 +0200 [PCMCIA] i82365: release all resources if no devices are found The i82365 driver does not release all the resources when the device is not found. This can cause an oops when reading /proc/ioports after module unload. Signed-off-by: Igor Popik Signed-off-by: Dominik Brodowski commit e34631508861237e598e7d72703eae4478761f37 Author: Marcelo Tosatti Date: Sat Nov 5 13:03:32 2005 -0200 [PCMCIA] MPC8xx PCMCIA update Kconfig entry: dependency on 8xx Makefile: fix whitespace breakage m8xx_pcmcia.c: - asm/segment.h is gone - use generic PCMCIA suspend/resume methods Signed-off-by: Marcelo Tosatti Signed-off-by: Dominik Brodowski commit 5ab0b374943b3e42a391a3929e91616ef37dda90 Author: Ralf Baechle Date: Wed Nov 2 18:08:40 2005 +0000 [PATCH] Alchemy PCMCIA: Fix config.h inclusion Add rsp. remove the inclusion of as needed. Signed-off-by: Ralf Baechle Signed-off-by: Dominik Brodowski commit fe360cdfd26503a6def1dfebc0ef8371c5071340 Author: Stephen Rothwell Date: Thu Nov 10 16:07:12 2005 +1100 powerpc: fix iSeries build Only MULTIPLATFORM has phbs_remap_io. Signed-off-by: Stephen Rothwell commit 97671e4b295fba1b7d3de2984f98bcdaeb197a26 Author: Paul Mackerras Date: Thu Nov 10 16:06:30 2005 +1100 ppc64: Add declarations to ppc64 headers as well as powerpc headers For now, we need these declarations that we moved from C code in the asm-ppc64 versions of these headers as well as the asm-powerpc versions. The asm-ppc64 versions will be disappearing shortly. Signed-off-by: Paul Mackerras commit fe98aeab8494cf431ef62e080cbe1dc1b6f5bd49 Author: Linas Vepstas Date: Thu Nov 3 18:51:17 2005 -0600 [PATCH] ppc64: bugfix: crash on PHB add 19-rpaphp-crashing.patch This patch fixes a bug related to dlpar PHB add, after a PHB removal. -- The crash was due to the PHB not having a pci_dn structure yet, when the phb is being added. This code survived testing, of adding and removeig the PHB and all slots underneath it, 17 times so far, as of this writing. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit d9564ad11454581f85b77026f290f4bb24eecf25 Author: Linas Vepstas Date: Thu Nov 3 18:50:48 2005 -0600 [PATCH] ppc64: mark failed devices 17-eeh-slot-marking-bug.patch A device that experiences a PCI outage may be just one deivce out of many that was affected. In order to avoid repeated reports of a failure, the entire tree of affected devices should be marked as failed. This patch marks up the entire tree. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 49b09853df1a303876b82a6480efb2f7b45ef041 Author: Paul Mackerras Date: Thu Nov 10 15:53:40 2005 +1100 powerpc: Move some extern declarations from C code into headers This also make klimit have the same type on 32-bit as on 64-bit, namely unsigned long, and defines and initializes it in one place. Signed-off-by: Paul Mackerras commit 06a98dba0d4b4f2f9b1f35f636beb166d6cbde34 Author: Stephen Rothwell Date: Thu Nov 10 15:51:14 2005 +1100 powerpc: implement atomic64_t on ppc64 Signed-off-by: Stephen Rothwell commit d3d2176a0bc696b5365ce0e8f82a29a521d85fd0 Author: David Gibson Date: Thu Nov 10 15:26:20 2005 +1100 [PATCH] powerpc: Move more ppc64 files with no ppc32 equivalent to powerpc This patch moves a bunch more files from arch/ppc64 and include/asm-ppc64 which have no equivalents in ppc32 code into arch/powerpc and include/asm-powerpc. The file affected are: hvcall.h proc_ppc64.c sysfs.c lparcfg.c rtas_pci.c The only changes apart from the move and corresponding Makefile changes are: - #ifndef/#define in includes updated to _ASM_POWERPC_ form - trailing whitespace removed - comments giving full paths removed Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built for 32-bit powermac (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 0f34f490290e05ee6c02e20b3811fce6f09318f4 Author: Benjamin Herrenschmidt Date: Thu Nov 10 15:04:24 2005 +1100 [PATCH] ppc64: fix PCI IO mapping phbs_remap_io(), which maps the PCI IO space into the kernel virtual space, is called too early on powermac, and thus doesn't work. This fixes it by removing the call from all platforms and putting it back into the ppc64 common code where it belongs, after the actual probing of the bus. That means that before that call, only the ISA IO space (if any) is mapped, any PIO access (from quirks for example) will fail. This happens not to be a problem for now, but we'll have to rework that code if it becomes one in the future. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 47c2ac8cc3cf7c484e131d10cb812b6ab198885a Author: Benjamin Herrenschmidt Date: Thu Nov 10 14:54:58 2005 +1100 [PATCH] powerpc: 64k pages vs. U3 iommu That DART (U3 iommu) code didn't properly scale the number of entries when using !4k pages. That caused crashes when booting G5s with more than 2Gb of RAM. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 87655ff26817993932b7d049c4df226fb2c0ac5f Author: Benjamin Herrenschmidt Date: Thu Nov 10 14:53:16 2005 +1100 [PATCH] powerpc: 64k pages pmd alloc fix This patch makes the kernel use a different kmem cache for PMD pages as they are smaller than PTE pages. Avoids waste of memory. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 676e2497f87501fb190a5b06103d396ca9147373 Author: Stephen Rothwell Date: Thu Nov 10 14:16:21 2005 +1100 powerpc: remove some warnings when building iSeries Signed-off-by: Stephen Rothwell commit 940e3318c36394939d805e797d7be39ddaaa7911 Author: Trond Myklebust Date: Wed Nov 9 21:45:24 2005 -0500 [PATCH] SUNRPC: don't reencode when looping in call transmit. If the call to xprt_transmit() fails due to socket buffer space exhaustion, we do not need to re-encode the RPC message when we loop back through call_transmit. Re-encoding can actually end up triggering the WARN_ON() in call_decode() if we re-encode something like a read() request and auth->au_rslack has changed. It can also cause us to increment the RPCSEC_GSS sequence number beyond the limits of the allowed window. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit e1449ed956ae29129bde3e5137dde1d579d585ff Author: Paul Mackerras Date: Thu Nov 10 14:30:20 2005 +1100 powerpc: 32-bit fixes for xmon This makes the memory examine/change command print the address as 8 digits instead of 16, and makes the memory dump command print 4 4-byte values per line instead of 2 8-byte values. Signed-off-by: Paul Mackerras commit a7ddc5e85351931b67a48afa22788d77763837d8 Author: Paul Mackerras Date: Thu Nov 10 14:29:18 2005 +1100 powerpc: Add user CPU features for POWER4, POWER5, POWER5+ and Cell. This is at the request of the glibc folks, who want to use these bits to select libraries optimized for the microarchitecture and new instructions in these processors. Signed-off-by: Paul Mackerras commit cbe62e2b4a764aa3f9a2b9c9004f8e86a1f0ade8 Author: Paul Mackerras Date: Thu Nov 10 14:28:03 2005 +1100 powerpc: Fix SMP time initialization problem We were getting the last_jiffy per-cpu variable set ahead of the current timebase in smp_space_timers on SMP machines. This caused the loop in timer_interrupt to loop virtually forever, since tb_ticks_since assumes that it will never be called with the timebase behind the last_jiffy value. Signed-off-by: Paul Mackerras commit 094fe2e712f38f49bf79ef93306c61b1b993b07b Author: Paul Mackerras Date: Thu Nov 10 14:26:12 2005 +1100 powerpc: Fixes for 32-bit powermac SMP A couple of bugs crept in with the merge of smp.c... Signed-off-by: Paul Mackerras commit 0a5cab42a1317326d87b0d074df50705a0c3fa77 Author: Paul Mackerras Date: Thu Nov 10 14:23:54 2005 +1100 powerpc: Fix compile error in EEH code with gcc4 Gcc 4 doesn't like being told to inline a recursive function... Signed-off-by: Paul Mackerras commit 3db9aaaf87b77eb9669157c723f6cb7e234bcef0 Author: Paul Mackerras Date: Thu Nov 10 14:23:18 2005 +1100 powerpc: Fix typo introduced in merging platform codes Signed-off-by: Paul Mackerras commit 799d6046d3fb557006e6d7c9767fdb96479b0e0a Author: Paul Mackerras Date: Thu Nov 10 13:37:51 2005 +1100 [PATCH] powerpc: merge code values for identifying platforms This patch merges platform codes. systemcfg->platform is no longer used, systemcfg use in general is deprecated as much as possible (and renamed _systemcfg before it gets completely moved elsewhere in a future patch), _machine is now used on ppc64 along as ppc32. Platform codes aren't gone yet but we are getting a step closer. A bunch of asm code in head[_64].S is also turned into C code. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 3ddfbcf19b15ccd25a0b4b2dc2e38000e08de739 Author: David Gibson Date: Thu Nov 10 12:56:55 2005 +1100 [PATCH] powerpc: Consolidate asm compatibility macros This patch consolidates macros used to generate assembly for compatibility across different CPUs or configs. A new header, asm-powerpc/asm-compat.h contains the main compatibility macros. It uses some preprocessor magic to make the macros suitable both for use in .S files, and in inline asm in .c files. Headers (bitops.h, uaccess.h, atomic.h, bug.h) which had their own such compatibility macros are changed to use asm-compat.h. ppc_asm.h is now for use in .S files *only*, and a #error enforces that. As such, we're a lot more careless about namespace pollution here than in asm-compat.h. While we're at it, this patch adds a call to the PPC405_ERR77 macro in futex.h which should have had it already, but didn't. Built and booted on pSeries, Maple and iSeries (ARCH=powerpc). Built for 32-bit powermac (ARCH=powerpc) and Walnut (ARCH=ppc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit f6d3577da14e877b79517c883d1139ee6ad7da45 Author: David Gibson Date: Thu Nov 10 12:42:17 2005 +1100 [PATCH] powerpc: Move scanlog.c to platforms/pseries scanlog.c is only compiled on pSeries. Thus, this patch moves it to platforms/pseries. Built and booted on pSeries LPAR (ARCH=powerpc and ARCH=ppc64). Built for iSeries (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 26ef5c09576496dfd08d2b36ec1d08a6f917a0eb Author: David Gibson Date: Thu Nov 10 11:50:16 2005 +1100 [PATCH] powerpc: Merge cacheflush.h and cache.h The ppc32 and ppc64 versions of cacheflush.h were almost identical. The two versions of cache.h are fairly similar, except for a bunch of register definitions in the ppc32 version which probably belong better elsewhere. This patch, therefore, merges both headers. Notable points: - there are several functions in cacheflush.h which exist only on ppc32 or only on ppc64. These are handled by #ifdef for now, but these should probably be consolidated, along with the actual code behind them later. - Confusingly, both ppc32 and ppc64 have a flush_dcache_range(), but they're subtly different: it uses dcbf on ppc32 and dcbst on ppc64, ppc64 has a flush_inval_dcache_range() which uses dcbf. These too should be merged and consolidated later. - Also flush_dcache_range() was defined in cacheflush.h on ppc64, and in cache.h on ppc32. In the merged version it's in cacheflush.h - On ppc32 flush_icache_range() is a normal function from misc.S. On ppc64, it was wrapper, testing a feature bit before calling __flush_icache_range() which does the actual flush. This patch takes the ppc64 approach, which amounts to no change on ppc32, since CPU_FTR_COHERENT_ICACHE will never be set there, but does mean renaming flush_icache_range() to __flush_icache_range() in arch/ppc/kernel/misc.S and arch/powerpc/kernel/misc_32.S - The PReP register info from asm-ppc/cache.h has moved to arch/ppc/platforms/prep_setup.c - The 8xx register info from asm-ppc/cache.h has moved to a new asm-powerpc/reg_8xx.h, included from reg.h - flush_dcache_all() was defined on ppc32 (only), but was never called (although it was exported). Thus this patch removes it from cacheflush.h and from ARCH=powerpc (misc_32.S) entirely. It's left in ARCH=ppc for now, with the prototype moved to ppc_ksyms.c. Built for Walnut (ARCH=ppc), 32-bit multiplatform (pmac, CHRP and PReP ARCH=ppc, pmac and CHRP ARCH=powerpc). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built for 32-bit powermac (ARCH=ppc and ARCH=powerpc). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built and booted on G5 (ARCH=powerpc) Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 482a8524f85a7d8c40c6fb5d072e85bc2fef327f Author: Thomas Graf Date: Thu Nov 10 02:25:56 2005 +0100 [NETLINK]: Generic netlink family The generic netlink family builds on top of netlink and provides simplifies access for the less demanding netlink users. It solves the problem of protocol numbers running out by introducing a so called controller taking care of id management and name resolving. Generic netlink modules register themself after filling out their id card (struct genl_family), after successful registration the modules are able to register callbacks to command numbers by filling out a struct genl_ops and calling genl_register_op(). The registered callbacks are invoked with attributes parsed making life of simple modules a lot easier. Although generic netlink modules can request static identifiers, it is recommended to use GENL_ID_GENERATE and to let the controller assign a unique identifier to the module. Userspace applications will then ask the controller and lookup the idenfier by the module name. Due to the current multicast implementation of netlink, the number of generic netlink modules is restricted to 1024 to avoid wasting memory for the per socket multiacst subscription bitmask. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 9ac4a16983ea4edf719c390a1a234d956947688d Author: Thomas Graf Date: Thu Nov 10 02:25:55 2005 +0100 [RTNETLINK]: Use generic netlink receive queue processor Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 88fc2c84312d095545c08a9f871ad1888a688cf6 Author: Thomas Graf Date: Thu Nov 10 02:25:54 2005 +0100 [XFRM]: Use generic netlink receive queue processor Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 82ace47a7256fd39d370a6442e0649f75961b831 Author: Thomas Graf Date: Thu Nov 10 02:25:53 2005 +0100 [NETLINK]: Generic netlink receive queue processor Introduces netlink_run_queue() to handle the receive queue of a netlink socket in a generic way. Processes as much as there was in the queue upon entry and invokes a callback function for each netlink message found. The callback function may refuse a message by returning a negative error code but setting the error pointer to 0 in which case netlink_run_queue() will return with a qlen != 0. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a8f74b228826eef1cbe04a05647d61e896f5fd63 Author: Thomas Graf Date: Thu Nov 10 02:25:52 2005 +0100 [NETLINK]: Make netlink_callback->done() optional Most netlink families make no use of the done() callback, making it optional gets rid of all unnecessary dummy implementations. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit bfa83a9e03cf8d501c6272999843470afecb32ed Author: Thomas Graf Date: Thu Nov 10 02:25:51 2005 +0100 [NETLINK]: Type-safe netlink messages/attributes interface Introduces a new type-safe interface for netlink message and attributes handling. The interface is fully binary compatible with the old interface towards userspace. Besides type safety, this interface features attribute validation capabilities, simplified message contstruction, and documentation. The resulting netlink code should be smaller, less error prone and easier to understand. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 00557b59c69ce284e5a61bcfcdbcc3dc867cb2da Author: Paul Mackerras Date: Thu Nov 10 12:01:41 2005 +1100 powerpc: Fix find_next_bit on 32-bit We had a "64" that didn't get changed to BITS_PER_LONG, resulting in find_next_bit not working correctly. Signed-off-by: Paul Mackerras commit a23414beb6607dfd40d3245f7df9dd97a4e2c82b Author: Paul Mackerras Date: Thu Nov 10 12:00:55 2005 +1100 ppc/powerpc: workarounds for old Open Firmware versions This adds code to work around some problems with old versions of Open Firmware, such as on the early powermacs (7500 etc.) and the "Longtrail" CHRP machine. On these machines we have to claim the physical and virtual address ranges explicitly when claiming memory and then set up a V->P mapping. The Longtrail has more problems: setprop doesn't work, and we have to set an "allow-reclaim" variable to 0 in order to get claim on physical memory ranges to fail if the memory is already claimed. Signed-off-by: Paul Mackerras commit 9fb9cbb1082d6b31fb45aa1a14432449a0df6cf1 Author: Yasuyuki Kozakai Date: Wed Nov 9 16:38:16 2005 -0800 [NETFILTER]: Add nf_conntrack subsystem. The existing connection tracking subsystem in netfilter can only handle ipv4. There were basically two choices present to add connection tracking support for ipv6. We could either duplicate all of the ipv4 connection tracking code into an ipv6 counterpart, or (the choice taken by these patches) we could design a generic layer that could handle both ipv4 and ipv6 and thus requiring only one sub-protocol (TCP, UDP, etc.) connection tracking helper module to be written. In fact nf_conntrack is capable of working with any layer 3 protocol. The existing ipv4 specific conntrack code could also not deal with the pecularities of doing connection tracking on ipv6, which is also cured here. For example, these issues include: 1) ICMPv6 handling, which is used for neighbour discovery in ipv6 thus some messages such as these should not participate in connection tracking since effectively they are like ARP messages 2) fragmentation must be handled differently in ipv6, because the simplistic "defrag, connection track and NAT, refrag" (which the existing ipv4 connection tracking does) approach simply isn't feasible in ipv6 3) ipv6 extension header parsing must occur at the correct spots before and after connection tracking decisions, and there were no provisions for this in the existing connection tracking design 4) ipv6 has no need for stateful NAT The ipv4 specific conntrack layer is kept around, until all of the ipv4 specific conntrack helpers are ported over to nf_conntrack and it is feature complete. Once that occurs, the old conntrack stuff will get placed into the feature-removal-schedule and we will fully kill it off 6 months later. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo commit 8b553f32db3bf5d0ec0819c595932eb21cd45945 Author: Linas Vepstas Date: Thu Nov 3 18:50:17 2005 -0600 [PATCH] ppc64: Save & restore of PCI device BARS 14-eeh-device-bar-save.patch After a PCI device has been resest, the device BAR's and other config space info must be restored to the same state as they were in when the firmware first handed us this device. This will allow the PCI device driver, when restarted, to correctly recognize and set up the device. Tis patch saves the device config space as early as reasonable after the firmware has handed over the device. Te state resore funcion is inteded for use by the EEH recovery routines. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 6dee3fb94004c43ce09f6bf5e7c0b778ec5b8cc8 Author: Linas Vepstas Date: Thu Nov 3 18:50:10 2005 -0600 [PATCH] ppc64: PCI reset support routines 13-eeh-recovery-support-routines.patch EEH Recovery support routines This patch adds routines required to help drive the recovery of EEH-frozen slots. The main function is to drive the PCI #RST signal line high for a qurter of a second, and then allow for a second & a half of settle time. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 172ca9261800bacbbc7d320d9924d9b482dff8de Author: Linas Vepstas Date: Thu Nov 3 18:50:04 2005 -0600 [PATCH] ppc64: PCI error event dispatcher 12-eeh-event-dispatcher.patch ppc64: EEH Recovery dispatcher thread This patch adds a mechanism to create recovery threads when an EEH event is received. Since an EEH freeze state may be detected within an interrupt context, we need to get out of the interrupt context before starting recovery. This dispatcher does this in two steps: first, it uses a workqueue to get out, and then lanuches a kernel thread, so that the recovery routine can sleep for exteded periods without upseting the keventd. A kernel thread is created with each EEH event, rather than having one long-running daemon started at boot time. This is because it is anticipated that EEH events will be very rare (very very rare, ideally) and so its pointless to cluter the process tables with a daemon that will almost never run. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 7f79da7accd63a6adb84f4602f66779f6a701e7b Author: Linas Vepstas Date: Thu Nov 3 18:49:51 2005 -0600 [PATCH] ppc64: move eeh.c to powerpc directory from ppc64 11-eeh-move-to-powerpc.patch Move arch/ppc64/kernel/eeh.c to arch//powerpc/platforms/pseries/eeh.c No other changes (except for Makefile to build it) Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit f8632c822719cce08cfb128859e354007744cbba Author: Linas Vepstas Date: Thu Nov 3 18:49:45 2005 -0600 [PATCH] ppc64: bugfix: don't silently ignore PCI errors 10-EEH-enable-bugfix.patch Bugfix: With the curent linux-2.6.14-rc2-git6, EEH errors are ignored because thier detection requires an unused, uninitialized flag to be set. This patch removes the unused flag. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 18126f35f69c928af26ec1dda2cb91b23220cdd4 Author: Linas Vepstas Date: Thu Nov 3 18:49:38 2005 -0600 [PATCH] ppc64: bugfix: crash on PCI hotplug 09-hotplug-bugfix.patch In the current 2.6.14-rc2-git6 kernel, performing a Dynamic LPAR Add of a hotplug slot will crash the system, with the following (abbreviated) stack trace: cpu 0x3: Vector: 700 (Program Check) at [c000000053dff7f0] pc: c0000000004f5974: .__alloc_bootmem+0x0/0xb0 lr: c0000000000258a0: .update_dn_pci_info+0x108/0x118 c0000000000257c8 .update_dn_pci_info+0x30/0x118 (unreliable) c0000000000258fc .pci_dn_reconfig_notifier+0x4c/0x64 c000000000060754 .notifier_call_chain+0x68/0x9c The root cause was that __init __alloc_bootmem() was called long after boot had finished, resulting in a crash because this routine is undefined after boot time. The patch below fixes this crash, and adds some docs to clarify the code. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 5c1344e988c716470b5609708215dd7f135f0e3a Author: Linas Vepstas Date: Thu Nov 3 18:49:31 2005 -0600 [PATCH] ppc64: escape hatch for spinning interrupt deadlocks 08-eeh-spin-counter.patch One an EEH event is triggers, all further I/O to a device is blocked (until reset). Bad device drivers may end up spinning in their interrupt handlers, trying to read an interrupt status register that will never change state. This patch moves that spin counter to a per-device structure, and adds some diagnostic prints to help locate the bad driver. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit fd761fd876e4d1c0d07b6d93bc45c999fa596cb0 Author: Linas Vepstas Date: Thu Nov 3 18:49:23 2005 -0600 [PATCH] ppc64: serialize reports of PCI errors 07-eeh-report-race.patch When a PCI slot is isolated, all PCI functions under that slot are affected. If hese functions have separate device drivers, the EEH isolation event might be reported multiple times. This patch adds a lock to prevent the racing of such multiple reports. It also marks every device under the slot as having experienced an EEH event, so that multiple reports may be recognized more easily. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 76e6faf7a3a3ad3e18a1b70f9e4cd96cdf58140d Author: Linas Vepstas Date: Thu Nov 3 18:49:15 2005 -0600 [PATCH] ppc64: avoid PCI error reporting for empty slots 06-eeh-empty-slot-error.patch Performing PCI config-space reads to empty PCI slots can lead to reports of "permanent failure" from the firmware. Ignore permanent failures on empty slots. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit df7242b1156966c3b1aa0fd2bc63e3736099b592 Author: Linas Vepstas Date: Thu Nov 3 18:49:01 2005 -0600 [PATCH] ppc64: RTAS error reporting restructuring 05-eeh-slot-error-detail.patch This patch encapsulates a section of code that reports the EEH event. The new subroutine can be used in several places to report the error. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 177bc9367efe89a642bc9a07351726fd2c31f5ff Author: Linas Vepstas Date: Thu Nov 3 18:48:52 2005 -0600 [PATCH] ppc64: PCI error rate statistics 04-eeh-statistics.patch This minor patch adds some statistics-gathering counters that allow the behaviour of the EEH subsystem o be monitored. While far from perfect, it does provide a rudimentary device that makes understanding of the current state of the system a bit easier. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 56b0fca3a008ddec8c00cfdddbef17bd9ce188e3 Author: Linas Vepstas Date: Thu Nov 3 18:48:45 2005 -0600 [PATCH] ppc64: PCI address cache minor fixes 03-eeh-addr-cache-cleanup.patch This is a minor patch to clean up a buglet related to the PCI address cache. (The buglet doesn't manifes itself unless there are also bugs elsewhere, which is why its minor.). Also: -- Improved debug printing. -- Declare some private routines as static -- Adds reference counting to struct pci_dn->pcidev structure Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 693765021460f19c5d7c638eb76e2efe1cd84752 Author: Linas Vepstas Date: Thu Nov 3 18:47:50 2005 -0600 [PATCH] ppc64: misc minor cleanup 02-eeh-minor-cleanup.patch This patch performs some minor cleanup of the eeh.c file, including: -- trim some trailing whitespace -- remove extraneous #includes -- use the macro PCI_DN uniformly, instead of the void pointer chase. -- typos in comments -- improved debug printk's Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit ae65a391caf1830aea9e4cadd69bb1aa69aad492 Author: linas Date: Thu Nov 3 18:42:26 2005 -0600 [PATCH] ppc64: uniform usage of bus unit id interfaces 01-pci-dn-uniformization.patch This patch changes the rtas_pci interface to use the new struct pci_dn structure for two routines that work with pci device nodes. This patch also does some minor janitorial work: it uses some handy macros and cleans up some trailing whitespace in the affected file. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 77ac166fba909d520b9a21dcc28cb49081e31033 Author: Benjamin Herrenschmidt Date: Thu Nov 10 11:12:11 2005 +1100 [PATCH] ppc64: Don't panic when early __ioremap fails Early calls to __ioremap() will panic if the hash insertion fails. This patch makes them return NULL instead. It happens with some pSeries users who enabled CONFIG_BOOTX_TEXT. The later is getting an incorrect address for the fame buffer and the hash insertion fails. With this patch, it will display an error instead of crashing at boot. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c44bc68dc0d2ca95e48b7242fef48200cd03352d Author: Olaf Hering Date: Wed Nov 9 20:54:43 2005 +0100 [PATCH] ppc64 boot: fix compile warnings Fix a few compile warnings arch/ppc64/boot/addRamDisk.c:166: warning: int format, long unsigned int arg (arg 2) arch/ppc64/boot/addRamDisk.c:170: warning: int format, long unsigned int arg (arg 2) arch/ppc64/boot/addRamDisk.c:265: warning: unsigned int format, long unsigned int arg (arg 2) arch/ppc64/boot/addRamDisk.c:302: warning: unsigned int format, long unsigned int arg (arg 3) Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 681c774d0fb59c9b9525c2879d1cfae29c2f7866 Author: Olaf Hering Date: Wed Nov 9 20:53:43 2005 +0100 [PATCH] ppc64 boot: remove sysmap from required filenames A stripped vmlinux does not contain enough symbols to recreate the System.map. The System.map file is only used to determine the end of the runtime memory size. This is the same value (rounded up to PAGE_SIZE) as ->memsiz in the ELF program header. Also, the target vmlinux.initrd doesnt work in 2.6.14: arch/ppc64/boot/addRamDisk arch/ppc64/boot/ramdisk.image.gz vmlinux.strip arch/ppc64/boot/vmlinux.initrd Name of vmlinux output file missing. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 58638bffe3d594ed3a902824ea40a4196c745bbd Author: Olaf Hering Date: Wed Nov 9 20:52:20 2005 +0100 [PATCH] ppc64 boot: remove argv usage Use a local variable for the input filenames. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit eba2fb2dac93ed01a9f85b2f623b49a93bef3ed7 Author: Olaf Hering Date: Wed Nov 9 20:51:03 2005 +0100 [PATCH] ppc64 boot: remove local initializers Remove initialization of local variables. They get all values assigned before use. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit f7b9996990bccaa9f53cbea7aea8ab5355e7f10c Author: Marcelo Tosatti Date: Wed Nov 9 11:00:16 2005 -0200 [PATCH] fs_enet build fix Due to the recent update of the platform code, some platform device drivers fail to compile. This fix is for fs_enet, adding #include of a new header, to which a number of platform stuff has been relocated. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 43cefe29d497c2a9d3c7eae89964260e7b35149e Author: Matt Porter Date: Wed Nov 9 06:42:05 2005 -0700 [PATCH] ppc32: fix ppc44x fpu build Fixes ppc44x fpu support that broke from a bad arch/powerpc merge. Instead of adding KernelFP back in (which duplicates code) we use the same kernel fpu unavailable handler as classic PPC processors. Signed-off-by: Matt Porter Signed-off-by: Paul Mackerras commit 8882a4da1c932c9f311c9f739e6719adea3e25d9 Author: David Gibson Date: Wed Nov 9 13:38:01 2005 +1100 [PATCH] powerpc: Move various ppc64 files with no ppc32 equivalent to powerpc This patch moves a bunch of files from arch/ppc64 and include/asm-ppc64 which have no equivalents in ppc32 code into arch/powerpc and include/asm-powerpc. The file affected are: abs_addr.h compat.h lppaca.h paca.h tce.h cpu_setup_power4.S ioctl32.c firmware.c pacaData.c The only changes apart from the move and corresponding Makefile changes are: - #ifndef/#define in includes updated to _ASM_POWERPC_ form - trailing whitespace removed - comments giving full paths removed - pacaData.c renamed paca.c to remove studlyCaps - Misplaced { moved in lppaca.h Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built for 32-bit powermac (ARCH=powerpc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 584224e4095d8abcf2bef38efacc291be9a44c20 Author: David Gibson Date: Wed Nov 9 13:04:06 2005 +1100 [PATCH] powerpc: Merge current.h This patch merges current.h. This is a one-big-ifdef merge, but both versions are so tiny, I think we can live with it. While we're at it, we get rid of the fairly pointless redirection through get_current() in the ppc64 version. Built and booted on POWER5 LPAR (ARCH=powerpc & ARCH=ppc64). Built for 32-bit pmac (ARCH=powerpc & ARCH=ppc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit c5ff700116a56a870ef40cc4ac6f19bf2530b466 Author: David Gibson Date: Wed Nov 9 11:21:07 2005 +1100 [PATCH] powerpc: Merge signal.h Having already merged the ppc and ppc64 versions of signal.c, this patch finishes the job by merging signal.h. The two versions were almost identical already. Notable changes: - We use BITS_PER_LONG to correctly size sigset_t - Remove some uneeded #includes and struct forward declarations. This does mean adding an include to signal_32.c which relied on the indirect inclusion of sigcontext.h - As the ppc64 version, the merged signal.h has prototypes for do_signal() and do_signal32(). Thus remove extra prototypes from ppc_ksyms.c which had them directly. Built and booted on POWER5 LPAR (ARCH=ppc64 and ARCH=powerpc). Built for 32-bit powermac (ARCH=ppc and ARCH=powerpc) and Walnut (ARCH=ppc). Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit e4d76e1c0b15590f2ad9bba89426c2520cd22ca6 Author: Andrew Morton Date: Wed Nov 9 15:45:30 2005 -0800 [PATCH] powerpc: sched fixups - Re-add a hunk lost during merge: ppc64 is missing the hunk that disables preempt on the secondary CPUs before they call cpu_idle(). - ppc's cpu_idle() had the need_resched() test wrong. Cc: Nick Piggin CC: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a47ab9371e664952b1104a70ec8e9b74db3f7a5f Author: Chen, Kenneth W Date: Wed Nov 9 15:45:29 2005 -0800 [PATCH] optimize activate_task() recalc_task_prio() is called from activate_task() to calculate dynamic priority and interactive credit for the activating task. For real-time scheduling process, all that dynamic calculation is thrown away at the end because rt priority is fixed. Patch to optimize recalc_task_prio() away for rt processes. Signed-off-by: Ken Chen Acked-by: Ingo Molnar Cc: Nick Piggin Cc: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07203f6471a11f4eda48acbe528c0ce4704ad42c Author: Ondrej Zary Date: Thu Nov 10 00:25:15 2005 +0100 [PATCH] ide-floppy: software eject not working with LS-120 drive The problem (eject not working on ATAPI LS-120 drive) is caused by idefloppy_ioctl() function which *first* tries generic_ide_ioctl() and *only* if it fails with -EINVAL, proceeds with the specific ioctls. The generic eject command fails with something other than -EINVAL and the specific one is never executed. This patch fixes it by first going through the internal ioctls and only trying generic_ide_ioctl() if none of them matches. Signed-off-by: Ondrej Zary commit 402771c786b71765c39d9a91f31b8c7b91faaa0a Author: Pierre Ossman Date: Wed Nov 9 23:22:27 2005 +0000 [MMC] wbsd version 1.5 New kernel, new patches, new version. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit de1d09e3e2ac576ee1e257b7d141c3cae4ce5fa9 Author: Pierre Ossman Date: Wed Nov 9 23:21:49 2005 +0000 [MMC] Add MODULE_AUTHOR to wbsd 'cause I'm in it for the chicks. ;) Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 7b7abfe3dd81d659a0889f88965168f7eef8c5c6 Author: Steve French Date: Wed Nov 9 15:21:09 2005 -0800 commit 93968d7551f1ff1806f70cdacf1bd997ef30836e Author: Pierre Ossman Date: Wed Nov 9 23:21:06 2005 +0000 [MMC] Use __devexit_p in wbsd wbsd_*_remove() is declared as __devexit but __devexit_p isn't used when taking their addresses. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit d868dd19ad0828b1b3b56f3b06bd4a39971847be Author: John W. Linville Date: Thu Nov 10 00:19:14 2005 +0100 [PATCH] siimage: enable interrupts on Adaptec SA-1210 card The siimage driver proports to support the Adaptec SA-1210 SATA controller. However, at least some of those cards boot-up with their interrupts disabled internally. The siimage driver currently ignores that fact, so that driver does not actually work with those cards. This patch enables those interrupts on cards that need it. [ This is implemented based on similar code in the libata-based sata_sil driver. ] Signed-off-by: John W. Linville commit 25000c2c8a6cbf9bba2de6560370ee222b4c613d Author: Alan Cox Date: Thu Nov 10 00:10:37 2005 +0100 [PATCH] ide: explain the PCI bus test we do in Matthew Wilcox asked that this got a comment explaining why it is done so here it is. Signed-off-by: Alan Cox commit f5b2d8b4b5146fa2d70fec7d514fa0bd64636958 Author: Jaya Kumar Date: Wed Nov 9 23:58:16 2005 +0100 [PATCH] ide: CS5535 driver Signed-off-by: Jaya Kumar commit 6730c3c14421b7c924d06e31bb66e0adad225547 Author: Linus Torvalds Date: Wed Nov 9 14:56:00 2005 -0800 Fix AGP compile on non-x86 architectures AGP shouldn't use "global_flush_tlb()" to flush the AGP mappings, that i spurely an x86'ism. The proper AGP mapping flusher that should be used is "flush_agp_mappings()", which on x86 obviously happens to do a global TLB flush. This makes AGP (or at least the config _I_ happen to use) compile again on ppc64. Signed-off-by: Linus Torvalds commit 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24 Author: Russell King Date: Wed Nov 9 22:32:44 2005 +0000 [DRIVER MODEL] Convert platform drivers to use struct platform_driver This allows us to eliminate the casts in the drivers, and eventually remove the use of the device_driver function pointer methods for platform device drivers. Signed-off-by: Russell King Acked-by: Greg Kroah-Hartman commit 7fab773de16ccaeb249acdc6e956a9759c68225d Author: Jordan Crouse Date: Wed Nov 9 23:26:09 2005 +0100 [PATCH] ide: AMD Geode GX/LX support From: "Jordan Crouse" The core IDE engine on the CS5536 is the same as the other AMD southbridges, so unlike the CS5535, we can simply add the appropriate PCI headers to the existing amd74xx code. commit 0046b06a367cd853efd3223ce60143f3a7952522 Author: Willem Riede Date: Wed Nov 9 23:18:22 2005 +0100 [PATCH] ide: ide-scsi fails to call idescsi_check_condition for things like "Medium not present" This patch started life as a response to fedora specific ide subsystem changes that made error handling of my ATAPI tape drive fail; the specifics are in https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=160868 The insertion of the statement rq->errors = err; near the end of ide_end_drive_cmd() in drivers/ide/ide-io.c means that rq->errors does not contain what it needs to in idescsi_end_request() in drivers/scsi/ide-scsi.c anymore. Recent mainline kernels now also have this change. The patch below makes ide-scsi whole. Signed-off-by: Willem Riede commit e851b620e775c9f0e00b1c7e35072d6b98097cb9 Author: Adrian Bunk Date: Wed Nov 9 23:07:56 2005 +0100 [PATCH] ide: possible cleanups This patch contains the following possible cleanups: - pci/cy82c693.c: make a needlessly global function static - remove the following unneeded EXPORT_SYMBOL's: - ide-taskfile.c: do_rw_taskfile - ide-iops.c: default_hwif_iops - ide-iops.c: default_hwif_transport - ide-iops.c: wait_for_ready Signed-off-by: Adrian Bunk commit 83ae20c849f1bff32100fa8584408dca99ce4a62 Author: Bjorn Helgaas Date: Wed Nov 9 22:58:07 2005 +0100 [PATCH] ide: move CONFIG_IDE_MAX_HWIFS into linux/ide.h CONFIG_IDE_MAX_HWIFS is a generic thing, no need to have it duplicated by every arch that uses it. Signed-off-by: Bjorn Helgaas commit 4349d5cdf28d46c22d467079e80ee9695dcec0ad Author: Hannes Reinecke Date: Wed Nov 9 22:47:18 2005 +0100 [PATCH] ide: incorrect device link for ide-cs Devices driven by ide-cs will appear under /sys/devices instead of the appropriate PCMCIA device. To fix this I had to extend the hw_regs_t structure with a 'struct device' field, which allows us to set the parent link for the appropriate hwif. Signed-off-by: Hannes Reinecke Signed-off-by: Jens Axboe commit ac4d5f74a9b243d9f3f123fe5ce609478df208d8 Author: Uwe Zeisberger Date: Wed Nov 9 15:54:08 2005 +0100 [PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error Do not include .config for target kernelrelease Signed-off-by: Uwe Zeisberger Signed-off-by: Sam Ravnborg commit e6a04466ba965875a6132700fabb2f2c0249c41a Author: Andrew Vasquez Date: Tue Nov 8 14:38:02 2005 -0800 [SCSI] qla2xxx: Update version number to 8.01.03-k. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 335a1cc976ffbb58491a9b6dc58955349e3f0388 Author: Andrew Vasquez Date: Tue Nov 8 14:37:48 2005 -0800 [SCSI] qla2xxx: Correct ISP24xx soft-reset handling. A driver must wait 100us before attempting an MMIO operation to the RISC after a soft-reset has been initiated. A similar delay was needed with earlier ISPs. Note: a PCI config-space read is used to flush the MMIO write to the ISP, since the ISP's state machines are unable to respond to any MMIO read during the reset process. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8d5708f3b5ea0765af92a79ebc4144c91718e695 Author: Ravi Anand Date: Tue Nov 8 14:37:34 2005 -0800 [SCSI] qla2xxx: Correct abort issue during loop-down state. Correct issue where abort I/O command was not being issued when the loop-state was down. Signed-off-by: Ravi Anand Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 33135aa2a568ec1a30e734f18e5315e10516e4f3 Author: Ravi Anand Date: Tue Nov 8 14:37:20 2005 -0800 [SCSI] qla2xxx: Correct loop-in-transition issues When mulitple initiators are coming up in an FCAL topology. Signed-off-by: Ravi Anand Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit dcb36ce9d9100eb821c6ea314b02f215cbdd8aca Author: Andrew Vasquez Date: Tue Nov 8 14:37:06 2005 -0800 [SCSI] qla2xxx: Correct additional posting issues during NVRAM accesses. On MMIO relaxed-order platforms, it is possible for the proper delay during NVRAM access to begin before the request passes through the PCI bus (via a MMIO write) to the ISP. Thus, causing a subsequent read to the NVRAM part to fail. Add a MMIO read, after the MMIO write to insure any posted writes are flushed. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 07ce5eba857cb7dc8f6ae39eda74b108efe4a3f8 Author: Mark Haverkamp Date: Tue Nov 8 14:26:33 2005 -0800 [SCSI] aacraid: Fix read capacity 16 return data Received from Mark Salyzyn. The return data from a read capacity 16 needs to have RTO_EN and PROT_EN zeroed out. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 9f0ede52a0ebfe1fe99ee5bfd99d17e6ac0c503d Author: Ken-ichirou MATSUZAWA Date: Wed Nov 9 13:08:29 2005 -0800 [IPV6]: ip6ip6_lock is not unlocked in error path. From: Ken-ichirou MATSUZAWA Signed-off-by: David S. Miller commit 44fd0261d3509b0b4303fd9ba792058d230186ab Author: Peter Chubb Date: Wed Nov 9 13:05:47 2005 -0800 [IPV6]: Fix fallout from CONFIG_IPV6_PRIVACY Trying to build today's 2.6.14+git snapshot gives undefined references to use_tempaddr Looks like an ifdef got left out. Signed-off-by: Peter Chubb Signed-off-by: David S. Miller commit 5fd52fe0989f8c84abd8d4a40ded79d4da911744 Author: Krzysztof Piotr Oledzki Date: Wed Nov 9 13:04:32 2005 -0800 [NETFILTER] ctnetlink: ICMP_ID is u_int16_t not u_int8_t. Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11 Author: Krzysztof Piotr Oledzki Date: Wed Nov 9 13:04:08 2005 -0800 [NETFILTER] ctnetlink: Fix oops when no ICMP ID info in message This patch fixes an userspace triggered oops. If there is no ICMP_ID info the reference to attr will be NULL. Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a856a19a9f3ee14fc0d555470f3af138aeb0245c Author: Pablo Neira Ayuso Date: Wed Nov 9 13:03:42 2005 -0800 [NETFILTER] ctnetlink: Add support to identify expectations by ID's Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit fcda46128d5cb50075339b79ce585ab767337e9e Author: Pablo Neira Ayuso Date: Wed Nov 9 13:03:26 2005 -0800 [NETFILTER] ctnetlink: propagate error instaed of returning -EPERM Propagate the error to userspace instead of returning -EPERM if the get conntrack operation fails. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit fe902a91ff427af7dbf20e7c196623b2a4eade13 Author: Pablo Neira Ayuso Date: Wed Nov 9 13:03:09 2005 -0800 [NETFILTER] ctnetlink: return -EINVAL if size is wrong Return -EINVAL if the size isn't OK instead of -EPERM. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d63a92810807e8da298895236f2b99697e884014 Author: Yasuyuki Kozakai Date: Wed Nov 9 13:02:45 2005 -0800 [NETFILTER]: stop tracking ICMP error at early point Currently connection tracking handles ICMP error like normal packets if it failed to get related connection. But it fails that after all. This makes connection tracking stop tracking ICMP error at early point. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ed77de9fc69076e6e7c85edf7c1b70650f53121a Author: Harald Welte Date: Wed Nov 9 13:02:16 2005 -0800 [NETFILTER] nfnetlink: only load subsystems if CAP_NET_ADMIN is set Without this patch, any user can cause nfnetlink subsystems to be autoloaded. Those subsystems however could add significant processing overhead to packet processing, and would refuse any configuration messages from non-CAP_NET_ADMIN processes anyway. This patch follows a suggestion from Patrick McHardy. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 5978a9b82c55b82a1087bd86e0ae8b00f94d0d0b Author: Philip Craig Date: Wed Nov 9 13:01:53 2005 -0800 [NETFILTER] PPTP helper: fix PNS-PAC expectation call id The reply tuple of the PNS->PAC expectation was using the wrong call id. So we had the following situation: - PNS behind NAT firewall - PNS call id requires NATing - PNS->PAC gre packet arrives first then the PNS->PAC expectation is matched, and the other expectation is deleted, but the PAC->P