summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Linux v2.6.22-rc2v2.6.22-rc2Linus Torvalds2007-05-181-1/+1
|
* cciss: Fix pci_driver.shutdown while device is still activeGerald Britton2007-05-181-15/+30
| | | | | | | | | | | | | | | | | Fix an Oops in the cciss driver caused by system shutdown while a filesystem on a cciss device is still active. The cciss_remove_one function only properly removes the device if the device has been cleanly released by its users, which is not the case when the pci_driver.shutdown method is called. This patch adds a new cciss_shutdown function to better match the pattern used by various SCSI drivers: deactivate device interrupts and flush caches. It also alters the cciss_remove_one function to match and readds the __devexit annotation that was removed when cciss_remove_one was serving as the pci_driver.shutdown method. Signed-off-by: Gerald Britton <gbritton@alum.mit.edu> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Further update of the i386 boot documentationH. Peter Anvin2007-05-181-82/+303
| | | | | | | | | | | A number of items in the i386 boot documentation have been either vague, outdated or hard to read. This text revision adds several more examples, including a memory map for a modern kernel load. It also adds a field-by-field detailed description of the setup header, and a bootloader ID for Qemu. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2007-05-182-3/+3
|\ | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] tcrypt: Add missing error check [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again
| * [CRYPTO] tcrypt: Add missing error checkHerbert Xu2007-05-181-1/+1
| | | | | | | | | | | | | | The return value of crypto_hash_final isn't checked in test_hash_cycles. This patch corrects this. Thanks to Eric Sesterhenn for reporting this. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate againHerbert Xu2007-05-181-2/+2
| | | | | | | | | | | | | | Turning it into a boolean was unnecessary and caused ALGAPI to be pinned down as a boolean to. This patch makes it a tristate again. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
* | Fix roundup_pow_of_two(1)Rolf Eike Beer2007-05-181-1/+1
| | | | | | | | | | | | | | | | | | 1 is a power of two, therefore roundup_pow_of_two(1) should return 1. It does in case the argument is a variable but in case it's a constant it behaves wrong and returns 0. Probably nobody ever did it so this was never noticed. Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | timerfd use waitqueue lock ...Davide Libenzi2007-05-181-13/+11
| | | | | | | | | | | | | | | | | | | | The timerfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes timerfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | eventfd use waitqueue lock ...Davide Libenzi2007-05-181-14/+12
| | | | | | | | | | | | | | | | | | | | The eventfd was using the unlocked waitqueue operations, but it was using a different lock, so poll_wait() would race with it. This makes eventfd directly use the waitqueue lock. Signed-off-by: Davide Libenzi <davidel@xmailserver.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'master' of ↵Linus Torvalds2007-05-1847-582/+782
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits) [POWERPC] Remove build warnings in windfarm_core [POWERPC] Pass per-file CFLAGs for platform specific op codes [POWERPC] Correct #endif comment [POWERPC] Fix ppc_rtas_progress_show() [POWERPC] Fix sed command lines for zlib source construction [POWERPC] Specify GNUTARGET on $(AR) invocations [POWERPC] Make sure device node type/name is not NULL on hot-added nodes [POWERPC] Small fixes for the Ebony device tree [POWERPC] Fix warning on UP [POWERPC] cell_defconfig: Disable cpufreq and pmi [POWERPC] Fix IO space on PCI buses created from of_platform [POWERPC] Add spinlock to request_phb_iospace() [POWERPC] Fix make rules for treeImage.initrd [POWERPC] Remove warning in mpic.c [POWERPC] Update pasemi_defconfig [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed [POWERPC] Update iseries_defconfig [POWERPC] Wire up some more syscalls [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop() [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error ...
| * | [POWERPC] Remove build warnings in windfarm_coreStephen Rothwell2007-05-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/macintosh/windfarm_core.c: In function 'wf_register_control': drivers/macintosh/windfarm_core.c:219: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result drivers/macintosh/windfarm_core.c: In function 'wf_register_sensor': drivers/macintosh/windfarm_core.c:329: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Pass per-file CFLAGs for platform specific op codesJosh Boyer2007-05-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result of compiling all of the wrapper files for every platform now, the kernel build can fail for toolchains that don't support various op codes by default. An example of this building a 7xx platform with the ELD4.0 toolchain, is below: /tmp/ccYjhJoL.s: Assembler messages: /tmp/ccYjhJoL.s:42: Error: Unrecognized opcode: `mtdcr' /tmp/ccYjhJoL.s:43: Error: Unrecognized opcode: `mfdcr' make[1]: *** [arch/powerpc/boot/44x.o] Error 1 The following patch introduces additional CFLAGS for the 4xx specific files and fixes the kernel compile. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Correct #endif commentJon Tollefson2007-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up comment on two #endifs to match their #ifs. Signed-off-by: Jon Tollefson <kniht@linux.vnet.ibm.com> ---- hash_utils_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix ppc_rtas_progress_show()Segher Boessenkool2007-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the warning arch/powerpc/kernel/rtas-proc.c: In function 'ppc_rtas_progress_show': arch/powerpc/kernel/rtas-proc.c:382: warning: the address of 'progress_led' will always evaluate as 'true' by fixing the code to do what it presumably is meant to do. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix sed command lines for zlib source constructionSegher Boessenkool2007-05-171-3/+3
| | | | | | | | | | | | | | | | | | | | | Not every sed understands \+ so use the more portable * instead. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Specify GNUTARGET on $(AR) invocationsSegher Boessenkool2007-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, some versions of GNU ar fail to create an archive index if the object files it is packing together are of a different object format than ar's default format (for example, binutils compiled to default to 64-bit, with 32-bit objects). Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Make sure device node type/name is not NULL on hot-added nodesBenjamin Herrenschmidt2007-05-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our device-tree unflattening code makes sure the name and type fields of a device-node are not NULL. However, the code for dynamically adding devices nodes which is used for pSeries hotplug for example didn't do it, potentially causing crashes in some code that assume it can always do things like strcmp on those. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Small fixes for the Ebony device treeDavid Gibson2007-05-172-27/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects a number of minor errors in the Ebony device tree: - Missing (given as 0) cache sizes are added to the CPU node - device_type properties are removed from nodes which don't have a reasonably well defined device_type binding. This does require a very small code change to locate the busses to be probed for of_platform devices by 'compatible' instead of 'device_type'. - A node is added for the SRAM controller - The unit address of the small-flash node is adjusted to correctly reflect the reg property. - device_type values for the MAL and ZMII are updated to reflected more up-to-date versions of the binding. - An incorrect offset in the partition map for the large-flash node is corrected. - Some redundant values, already commented out are removed entirely. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix warning on UPStephen Rothwell2007-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/powerpc/platforms/pseries/pseries.h:24: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:25: warning: return type defaults to 'int' arch/powerpc/platforms/pseries/pseries.h:24: warning: control reaches end of non-void function arch/powerpc/platforms/pseries/pseries.h:25: warning: control reaches end of non-void function Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] cell_defconfig: Disable cpufreq and pmiChristian Krafft2007-05-171-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cpufreq using pmi is broken by a dependency issue, that will be fixed in a seperate patch. Bare-metal cpufreq is broken by hardware limitations. As it was the only user, pmi is disabled as well. Signed-off-by: Christian Krafft <krafft@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix IO space on PCI buses created from of_platformBenjamin Herrenschmidt2007-05-172-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the way of_platform_pci creates PCI host bridges such that it uses request_phb_iospace() for mapping the IO ports, instead of using the dynamic hotplug stuff. That guarantees the IO space stays within the 2GB limit and thus doesn't break half of the legacy drivers around. Fixes a couple of warnings due to missing IO space while at it. This patch is a temporary workaround for 2.6.22 before a more complete rewrite of IO mappings is merged in 2.6.23 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add spinlock to request_phb_iospace()Benjamin Herrenschmidt2007-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request_phb_iospace() can be called from different CPUs at init time (at least with my next patch) and thus needs a spinlock. As for the next patch, this is a temporary workaround for 2.6.22 issues until my rewrite of IO mappings is ready (for 2.6.23) Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix make rules for treeImage.initrdDavid Gibson2007-05-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present attempting to build treeImage.initrd.* boot images will fail, because make will select the treeImage.% rule which also matches instead of the correct and more specific treeImage.initrd.% rule. This patch corrects the problem by listing the more specific rule first. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Remove warning in mpic.cOlof Johansson2007-05-171-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | arch/powerpc/sysdev/mpic.c: In function 'mpic_request_ipis': arch/powerpc/sysdev/mpic.c:1445: warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Update pasemi_defconfigOlof Johansson2007-05-171-164/+219
| | | | | | | | | | | | | | | | | | | | | | | | Update pasemi_defconfig, add new relevant drivers. Take out CONFIG_PPC_PSERIES, it should't have been enabled in the first place. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer neededOlof Johansson2007-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Current kernel implements proper TB sync, no need to keep GENERIC_TBSYNC enabled. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Update iseries_defconfigStephen Rothwell2007-05-171-93/+116
| | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Wire up some more syscallsStephen Rothwell2007-05-172-1/+7
| | | | | | | | | | | | | | | | | | | | | signalfd, timerfd and eventfd Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()David Gibson2007-05-171-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ft_set_prop() from flatdevtree.c in the zImage wrapper will either replace an existing property in the flat device tree, or add a new property definiion if the given property isn't present. However, when adding properties, it adds the property definition immediately before the node's END_NODE tag, potentially after any subnode definitions for the node. This confuses the kernel flat tree parser in prom.c which assumes that all property definitions for a node come before all subnode definitions. This patch corrects ft_set_prop() so that it adds new properties before the first subnode, instead of before the END_NODE tag. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Scott Wood <scottwood@freescale.com> Acked-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link errorDavid Gibson2007-05-172-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no actual implementations of fixup_bigphys_addr() in arch/powerpc, and with a 64-bit aware ioremap() and so forth, it should no longer be necessary. This patch removes the last dregs of fixup_bigphys_addr() from arch/powerpc. In fact, the only reason this hasn't caused link errors already is that nobody must have tried using one of the small number of drivers using io_remap_pfn_range() on one of the small number of platforms which are 32-bit but define CONFIG_PHYS_64BIT. Nonetheless this fixes a bug, and should go into 2.6.22. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] viopath: Use a completion in some more placesChristoph Hellwig2007-05-171-6/+6
| | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] viopath: Use completionChristoph Hellwig2007-05-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a completion instead of abusing a semaphore for hypervisor event completion in viopath. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix Kconfig undefined symbol 'IBM_NEW_EMAC_ZMII'Tony Breeds2007-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An allmodconfig on the current powerpc tree yields: arch/powerpc/platforms/44x/Kconfig:41:warning: 'select' used by config symbol '440GP' refers to undefined symbol 'IBM_NEW_EMAC_ZMII' Hide the select until the driver exists. Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Removed hardcoded phandles from dtsKumar Gala2007-05-175-168/+139
| | | | | | | | | | | | | | | | | | | | | Remove explicit phandles and move to using references that autogenerate the phandles when needed. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [PPC] MCC2 missing in MPC826x device_listMorten Banzon2007-05-171-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the MCC2 device to the 826x device_list and fixed MCC1/MCC2 entries in all other PQ2 processors. Signed-off-by: Morten Banzon <morten.banzon@ericsson.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] 85xx: Add device nodes for error reporting devices used by EDACKumar Gala2007-05-174-0/+64
| | | | | | | | | | | | | | | | | | | | | Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8541 CDS, MPC8544 DS, MPC8555 CDS, and MPC8568 MDS. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] 85xx: Add device nodes for error reporting devices used by EDACDave Jiang2007-05-173-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding memory-controller and l2-cache-controller entries to be used by EDAC as of_devices for MPC8540 ADS, MPC8548 CDS, and MPC8560 ADS. Also fixed up the size of the PCI node on MPC8560 ADS. Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] Fix alignment problem in rh_alloc_align() with exact-sized blocksTimur Tabi2007-05-171-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an rheap is created, the caller can specify the alignment to use. In rh_alloc_align(), if a free block is found that is the exact size needed (including extra space for alignment), that configured alignment value is not used to align the pointer. Instead, the default alignment is used. If the default alignment is smaller than the configured alignment, then the returned value will not be aligned correctly. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] Fix COMMON symbol warningsKumar Gala2007-05-172-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get the following warnings in various ARCH=powerpc builds: WARNING: "ee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "fee_restarts" [arch/powerpc/kernel/built-in] is COMMON symbol WARNING: "htab_hash_searches" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "next_slot" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "mmu_hash_lock" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "primary_pteg_full" [arch/powerpc/mm/built-in] is COMMON symbol WARNING: "global_dbcr0" [arch/powerpc/kernel/built-in] is COMMON symbol Switch to moving local symbols (except mmu_hash_lock which is global) and space directive instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] Fix comment in booke_wdtDave Jiang2007-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The early kernel parameter is wdt and not wdt_enable. according to arch/powerpc/kernel/setup_32.c. Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] Remove CPU_FTR_NEED_COHERENT for 7448.James.Yang2007-05-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CPU_FTR_NEED_COHERENT for MPC7448 (and single-core MPC86xx). This prevents needlessly setting M=1 when not SMP. Signed-off-by: James.Yang <James.Yang@freescale.com> Acked-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | [POWERPC] Change include protections to ASM_POWERPCBecky Bruce2007-05-175-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change several headers in include/asm-powerpc that currently use some variation of ASM_PPC to use ASM_POWERPC instead. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2007-05-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix sched_clock() et al.
| * | | [SPARC64]: Fix sched_clock() et al.David S. Miller2007-05-171-1/+1
| | |/ | |/| | | | | | | | | | | | | SPARC64_NSEC_PER_CYC_SHIFT was set too high. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2007-05-186-27/+103
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Remove IPVS icmp hack from route.c for now. [IPV4]: Correct rp_filter help text. [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS [TCP] slow start: Make comments and code logic clearer. [BLUETOOTH]: Fix locking in hci_sock_dev_event(). [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h [NET]: lockdep classes in register_netdevice
| * | | [IPV4]: Remove IPVS icmp hack from route.c for now.David S. Miller2007-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert: 2d771cd86d4c3af26f34a7bcdc1b87696824cad9 This is dangerous if enabled and a better solution to the problem is being worked on. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [IPV4]: Correct rp_filter help text.Dave Jones2007-05-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in http://bugzilla.kernel.org/show_bug.cgi?id=5015 The helptext implies that this is on by default. This may be true on some distros (Fedora/RHEL have it enabled in /etc/sysctl.conf), but the kernel defaults to it off. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGASDavid S. Miller2007-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | These two congestion control modules share code. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP] slow start: Make comments and code logic clearer.Stephen Hemminger2007-05-171-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more comments to describe our version of tcp_slow_start(). Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BLUETOOTH]: Fix locking in hci_sock_dev_event().Satyam Sharma2007-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We presently use lock_sock() to acquire a lock on a socket in hci_sock_dev_event(), but this goes BUG because lock_sock() can sleep and we're already holding a read-write spinlock at that point. So, we must use the non-sleeping BH version, bh_lock_sock(). However, hci_sock_dev_event() is called from user context and hence using simply bh_lock_sock() will deadlock against a concurrent softirq that tries to acquire a lock on the same socket. Hence, disabling BH's before acquiring the socket lock and enable them afterwards, is the proper solution to fix socket locking in hci_sock_dev_event(). Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud