summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [NETFILTER]: reduce netfilter sk_buff enlargementHarald Welte2005-08-2927-64/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed at netconf'05, we're trying to save every bit in sk_buff. The patch below makes sk_buff 8 bytes smaller. I did some basic testing on my notebook and it seems to work. The only real in-tree user of nfcache was IPVS, who only needs a single bit. Unfortunately I couldn't find some other free bit in sk_buff to stuff that bit into, so I introduced a separate field for them. Maybe the IPVS guys can resolve that to further save space. Initially I wanted to shrink pkt_type to three bits (PACKET_HOST and alike are only 6 values defined), but unfortunately the bluetooth code overloads pkt_type :( The conntrack-event-api (out-of-tree) uses nfcache, but Rusty just came up with a way how to do it without any skb fields, so it's safe to remove it. - remove all never-implemented 'nfcache' code - don't have ipvs code abuse 'nfcache' field. currently get's their own compile-conditional skb->ipvs_property field. IPVS maintainers can decide to move this bit elswhere, but nfcache needs to die. - remove skb->nfcache field to save 4 bytes - move skb->nfctinfo into three unused bits to save further 4 bytes Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: convert nfmark and conntrack mark to 32bitHarald Welte2005-08-298-7/+38
| | | | | | | | As discussed at netconf'05, we convert nfmark and conntrack-mark to be 32bits even on 64bit architectures. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge refs/heads/upstream from ↵Linus Torvalds2005-08-2918-296/+422
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * Merge /spare/repo/linux-2.6/Jeff Garzik2005-08-29261-6213/+13105
| |\
| * | [libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPLJeff Garzik2005-08-291-14/+13
| | |
| * | [libata] license change, other bitsJeff Garzik2005-08-2818-282/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changes license of all code from OSL+GPL to plain ole GPL - except for NVIDIA, who hasn't yet responded about sata_nv - copyright holders were already contacted privately - adds info in each driver about where hardware/protocol docs may be obtained - where I have made major contributions, updated copyright dates
* | | [SPARC64]: More fully work around Spitfire Errata 51.David S. Miller2005-08-2914-54/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that a memory barrier soon after a mispredicted branch, not just in the delay slot, can cause the hang condition of this cpu errata. So move them out-of-line, and explicitly put them into a "branch always, predict taken" delay slot which should fully kill this problem. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC64]: Make debugging spinlocks usable again.David S. Miller2005-08-293-65/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the spinlock routines were moved out of line into kernel/spinlock.c this made it so that the debugging spinlocks record lock acquisition program counts in the kernel/spinlock.c functions not in their callers. This makes the debugging info kind of useless. So record the correct caller's program counter and now this feature is useful once more. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC]: remove use of asm/segment.hKumar Gala2005-08-298-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removed sparc architecture specific users of asm/segment.h and asm-sparc/segment.h itself Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC64]: remove use of asm/segment.hKumar Gala2005-08-293-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removed sparc64 architecture specific users of asm/segment.h and asm-sparc64/segment.h itself Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC64]: Revamp Spitfire error trap handling.David S. Miller2005-08-296-245/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current uncorrectable error handling was poor enough that the processor could just loop taking the same trap over and over again. Fix things up so that we at least get a log message and perhaps even some register state. In the process, much consolidation became possible, particularly with the correctable error handler. Prefix assembler and C function names with "spitfire" to indicate that these are for Ultra-I/II/IIi/IIe only. More work is needed to make these routines robust and featureful to the level of the Ultra-III error handlers. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC64]: Do not call winfix_dax blindlyDavid S. Miller2005-08-292-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Verify we really are taking a data access exception trap, at TL1, from one of the window spill/fill handlers. Else call a new function, data_access_exception_tl1, to log the error. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC64]: Fix trap state reading for instruction_access_exception.David S. Miller2005-08-291-11/+4
| |/ |/| | | | | | | | | | | | | | | | | 1) Read ASI_IMMU SFSR not ASI_DMMU. 2) IMMU has no SFAR, read TPC instead 3) Delete old and incorrect comment about the DTLB protection trap having a dependency on the SFSR contents in order to function correctly Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] missing include in smc-ultraAl Viro2005-08-291-0/+1
| | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] missing include in tda80xxAl Viro2005-08-291-0/+1
| | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] mod_devicetable.h fixesAl Viro2005-08-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ieee1394_device_id has kernel_ulong_t field after an odd number of __u32 ones. Since mod_devicetable.h is included both from kernel and from host build helper, we may be in trouble if we are building on 32bit host for 64bit target - userland sees unsigned long long, kernel sees unsigned long and while their sizes match, alignments might not. Fixed by forcing alignment. Fortunately, almost nobody else needs that - the rest of such fields is naturally aligned as it is. * of_device_id has void * in it. Host userland helpers need kernel_ulong_t instead, since their void * might have nothing to do with the kernel one. Fixed in the same way it's done for similar problems in pcmcia_device_id (ifdef __KERNEL__). * pcmcia_device_id has the same problem as ieee1394_device_id. Fixed the same way. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] new name for 2.6.14Benjamin LaHaise2005-08-291-1/+1
| | | | | | | | | | | | | | | | We've had Woozy Numbat for a while now. Here's an updated name care of Jeff Garzik and myself. Signed-off-by: Benjamin LaHaise <bcrl@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge HEAD from ↵Linus Torvalds2005-08-2969-1424/+2732
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
| * | [PATCH] IB: move include files to include/rdmaRoland Dreier2005-08-2641-57/+51
| | | | | | | | | | | | | | | | | | | | | | | | Move the InfiniBand headers from drivers/infiniband/include to include/rdma. This allows InfiniBand-using code to live elsewhere, and lets us remove the ugly EXTRA_CFLAGS include path from the InfiniBand Makefiles. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IPoIB: Fix device removal raceMichael S. Tsirkin2005-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we may have work scheduled in default kernel workqueue when the device is going down. The device could get freed before this workqueue gets serviced. I am actually seeing this causing system hangs. The following patch fixes this by using ipoib_workqueue which gets flushed when the device is going down. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Add handling for ABORT and STOP RMPP MADs.Sean Hefty2005-08-262-65/+246
| | | | | | | | | | | | | | | | | | | | | Add handling for ABORT / STOP RMPP MADs. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: fix userspace CM deadlockSean Hefty2005-08-262-313/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deadlock condition resulting from trying to destroy a cm_id from the context of a CM thread. The synchronization around the ucm context structure is simplified as a result, and some simple code cleanup is included. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IPoIB: Set full membership bit in P_KeysRoland Dreier2005-08-261-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Always make sure that the full membership bit is set in the P_Keys that IPoIB uses. This makes sure that all hosts join the correct multicast groups so that hosts that are partial partition members can talk to the rest of the network. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Add SRQ implementationRoland Dreier2005-08-2613-25/+857
| | | | | | | | | | | | | | | | | | | | | Add mthca support for shared receive queues (SRQs), including userspace SRQs. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Handle context tables smaller than our chunk sizeRoland Dreier2005-08-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a table in context memory where the table is smaller than our chunk size, we don't want to allocate and map a full chunk. Instead, allocate just enough memory to cover the table. This can be pretty simple because all tables are a power-of-2 size, so either the table is a multiple of the chunk size, or it's smaller than one chunk. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Move WQE structures into their own headerRoland Dreier2005-08-262-74/+115
| | | | | | | | | | | | | | | | | | | | | | | | Move the definitions of the WQE structures from mthca_qp.c into mthca_wqe.h, so that we'll be able to share them when we add the SRQ code in mthca_srq.c. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Simplify handling of completions with errorRoland Dreier2005-08-262-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Mem-free HCAs never generate error CQEs that complete multiple WQEs, so just skip the call to mthca_free_err_wqe() for them rather than having logic to handle the mem-free case in mthca_free_err_wqe(). Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Factor out common queue alloc codeRoland Dreier2005-08-265-224/+141
| | | | | | | | | | | | | | | | | | | | | | | | Clean up the allocation of memory for queues by factoring out the common code into mthca_buf_alloc() and mthca_buf_free(). Now CQs and QPs share the same queue allocation code, which we'll also use for SRQs. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: userspace SRQ supportRoland Dreier2005-08-264-4/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SRQ support to userspace verbs module. This adds several commands and associated structures, but it's OK to do this without bumping the ABI version because the commands are added at the end of the list so they don't change the existing numbering. There are two cases to worry about: 1. New kernel, old userspace. This is OK because old userspace simply won't try to use the new SRQ commands. None of the old commands are changed. 2. Old kernel, new userspace. This works perfectly as long as userspace doesn't try to use SRQ commands. If userspace tries to use SRQ commands, it will get EINVAL, which is perfectly reasonable: the kernel doesn't support SRQs, so we couldn't do any better. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Add SRQ support to midlayerRoland Dreier2005-08-262-5/+158
| | | | | | | | | | | | | | | | | | | | | Make the required core API additions and changes for shared receive queues (SRQs). Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Report correct max_msg_szRoland Dreier2005-08-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Set the max_msg_sz port property correctly in mthca's port_query function. Also zero out the attr struct so that we don't leave any other members uninitialized. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: Use correct port width capability valueRoland Dreier2005-08-265-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we call the INIT_IB firmware command to bring up a port, use the actual port width capability returned by the QUERY_DEV_LIM command instead of always trying to enable both 1X and 4X. This fixes breakage seen when the firmware is build to allow 4X only. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Remove unnecessary includes of <linux/version.h>Olaf Hering2005-08-264-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. Remove unneeded includes of <linux/version.h>. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Fix ib_mad_thread_completion_handler declarationHal Rosenstock2005-08-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change ib_mad_thread_completion_handler to conform to ib_comp_handler declaration. Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: use generic function instead of arbel_ version in ↵Guy German2005-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mthca_free_region() Use the generic key_to_hw_index() function instead of the Arbel-specific version in mthca_free_region(). Signed-off-by: Guy German <guyg@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: unmap FMRs when destroying FMR poolRoland Dreier2005-08-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that all FMRs are unmapped before we deallocate them so that we don't leak references to our protection domain when destroying an FMR pool. (Bug reported by Guy German <guyg@voltaire.com>) Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB/mthca: add HCA board ID to sysfs infoMichael S. Tsirkin2005-08-265-69/+109
| | | | | | | | | | | | | | | | | | | | | | | | Add support for reporting HCA board ID returned from QUERY_ADAPTER firmware command through sysfs. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: sparse endianness cleanupSean Hefty2005-08-2634-562/+565
| | | | | | | | | | | | | | | | | | | | | Fix sparse warnings. Use __be* where appropriate. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Eliminate redundant NULL checksHal Rosenstock2005-08-261-8/+4
| | | | | | | | | | | | | | | | | | | | | IPoIB: Eliminate NULL checks prior to calling kfree Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Add copyright noticesRoland Dreier2005-08-2639-17/+69
| | | | | | | | | | | | | | | | | | | | | Make some lawyers happy and add copyright notices for people who forgot to include them when they actually touched the code. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | [PATCH] IB: Update current firmware versions in mthca driverTziporet Koren2005-08-261-3/+3
| | | | | | | | | | | | | | | | | | | | | Update FW versions in mthca according to July 05 Mellanox release Signed-off-by: Tziporet Koren <tziporet@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
* | | Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git Linus Torvalds2005-08-296-39/+213
|\ \ \
| * | | [ARM] drop i386-isms from arm KconfigPavel Machek2005-08-281-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This kills i386-specific stuff from arm Kconfig. Please apply, Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] fs/adfs/adfs.h: "extern inline" doesn't make senseAdrian Bunk2005-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "extern inline" doesn't make sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Add support for ARM GICRussell King2005-08-184-0/+211
| | | | | | | | | | | | | | | | | | | | | | | | Add support for the ARM Generic Interrupt Controller. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git Linus Torvalds2005-08-296-22/+112
|\ \ \ \
| * | | | [MMC] Use an IDR for host name indiciesRussell King2005-08-192-2/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [MMC] Use class device name for mmc host nameRussell King2005-08-192-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point in having the host name duplicated between the mmc_host structure and the encapsulated class device structure. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [MMC] Add MMC class devicesRussell King2005-08-194-14/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a mmc_host class to allow enumeration of MMC host controllers even though they have no card(s) inserted. Patch based on work by Pierre Ossman. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [MMC] Add mmc_hostname() macroRussell King2005-08-195-7/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | mmc_hostname() returns a pointer to the hostname for the mmc_host. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud