aboutsummaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2005-10-27Merge branch 'master'Jeff Garzik3-4/+5
2005-10-27Merge branch 'master'Jeff Garzik3-4/+5
2005-10-27Revert "x86-64: Avoid unnecessary double bouncing for swiotlb"Linus Torvalds1-3/+3
Commit id 6142891a0c0209c91aa4a98f725de0d6e2ed4918 Andi Kleen reports that it seems to break things for some people, and since it's purely a small optimization, revert it for now. Signed-off-by: Linus Torvalds <[email protected]>
2005-10-27Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6Trond Myklebust10-54/+72
2005-10-26Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds1-0/+2
2005-10-26Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-1/+0
2005-10-26[ARM] 3032/1: sparse: complains about generic_fls() prototype in ↵Ian Campbell1-1/+0
asm-arm/bitops.h Patch from Ian Campbell Sparse complains about the definition of generic_fls in asm-arm/bitops.h: CHECK /home/icampbell/devel/kernel/2.6/arch/arm/mach-pxa/viper.c include2/asm/bitops.h:350:34: error: marked inline, but without a definition The definition is unnecessary since linux/bitops.h defines generic_fls before including asm/bitops.h and asm/bitops.h should not be included directly. There are still some places where asm/bitops.h is directly included, but I think that code should be fixed. I was a little wary of the patch for this reason but lubbock, mainstone and assabet all build OK and so do my in house boards... ARM is the only arch with the generic_fls prototype in this way. Signed-off-by: Ian Campbell <[email protected]> Signed-off-by: Russell King <[email protected]>
2005-10-26Merge branch 'master'Jeff Garzik8-53/+70
2005-10-26Merge branch 'master'Jeff Garzik8-53/+70
2005-10-26[SK_BUFF] kernel-doc: fix skbuff warningsRandy Dunlap1-1/+2
Add kernel-doc to skbuff.h, skbuff.c to eliminate kernel-doc warnings. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2005-10-26[IPSEC]: Kill obsolete get_mss functionHerbert Xu1-1/+0
Now that we've switched over to storing MTUs in the xfrm_dst entries, we no longer need the dst's get_mss methods. This patch gets rid of them. It also documents the fact that our MTU calculation is not optimal for ESP. Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2005-10-25[LLC]: Strip RIF flag from source MAC addressJochen Friedrich1-1/+3
Signed-off-by: Jochen Friedrich <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2005-10-25[PATCH] alpha: atomic dependency fixAndrew Morton3-30/+37
My alpha build is exploding because asm/atomic.h now needs smb_mb(), which is over in the (not included) system.h. I fear what will happen if I include system.h into atomic.h, so let's put the barriers into their own header file. Cc: Richard Henderson <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2005-10-24[SERIAL] new hp diva console portJustin Chen1-0/+1
Add the new ID 0x132a and configure the new PCI Diva console port. This device supports only 1 single console UART. Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Russell King <[email protected]>
2005-10-24[SERIAL] support the Exsys EX-4055 4S four-port cardBjorn Helgaas1-0/+1
Tested by Wolfgang Denk with this device: 00:0f.0 Network controller: PLX Technology, Inc. PCI <-> IOBus Bridge (rev 01) Subsystem: Exsys EX-4055 4S(16C550) RS-232 Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap- 66Mhz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- Interrupt: pin A routed to IRQ 10 Region 0: Memory at 80100000 (32-bit, non-prefetchable) [size=128] Region 1: I/O ports at 7080 [size=128] Region 2: I/O ports at 7400 [size=32] 00:0f.0 Class 0280: 10b5:9050 (rev 01) Subsystem: d84d:4055 Results with this patch: Serial: 8250/16550 driver $Revision: 1.90 $ 32 ports, IRQ sharing enabled ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A PCI: Found IRQ 10 for device 0000:00:0f.0 ttyS4 at I/O 0x7400 (irq = 10) is a 16550A ttyS5 at I/O 0x7408 (irq = 10) is a 16550A ttyS6 at I/O 0x7410 (irq = 10) is a 16550A ttyS7 at I/O 0x7418 (irq = 10) is a 16550A Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Russell King <[email protected]>
2005-10-23[PATCH] inotify/idr leak fixAndrew Morton1-0/+1
Fix a bug which was reported and diagnosed by Stefan Jones <[email protected]> IDR trees include a cache of idr_layer objects. There's no way to destroy this cache, so when we discard an overall idr tree we end up leaking some memory. Add and use idr_destroy() for this. v9fs and infiniband also need to use idr_destroy() to avoid leaks. Or, we make the cache global, like radix_tree_preload(). Which is probably better. Later. Cc: Eric Van Hensbergen <[email protected]> Cc: Roland Dreier <[email protected]> Cc: Robert Love <[email protected]> Cc: John McCutchan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2005-10-22[PATCH] alpha: additional smp barriersIvan Kokshaysky1-4/+8
As stated in Documentation/atomic_ops.txt, atomic functions returning values must have the memory barriers both before and after the operation. Thanks to DaveM for pointing that out. Signed-off-by: Ivan Kokshaysky <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2005-10-22[AX.25]: Fix signed char bugRalf Baechle1-1/+1
On architectures where the char type defaults to unsigned some of the arithmetic in the AX.25 stack to fail, resulting in some packets being dropped on receive. Credits for tracking this down and the original patch to Bob Brose N0QBJ <[email protected]>. Signed-off-by: Ralf Baechle DL5RB <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2005-10-22libata: const-ification bombing runJeff Garzik2-19/+19
Enforce access rules where appropriate. If the compiler is smart enough, this may buy us an optimization or two as a side effect.
2005-10-22libata: turn on block layer clusteringJeff Garzik1-1/+1
2005-10-21Merge branch 'upstream'Jeff Garzik8-14/+100
2005-10-21Add ide-timing functionality to libata.Alan Cox1-0/+39
This is needed for full AMD and VIA drivers and possibly more. Functions to turn actual clocking and cycle timings into register values. Also to merge shared timings to compute an optimal timing set. Built from the drivers/ide version by Vojtech Pavlik Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2005-10-21libata: handle early device PIO modes correctlyAlan Cox1-4/+9
2005-10-21Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-4/+17
2005-10-21Merge rsync://bughost.org/repos/ieee80211-delta/Jeff Garzik1-1/+1
2005-10-21Update version ieee80211 stamp to 1.1.6James Ketrenos1-1/+1
2005-10-20[ARM] 3028/1: S3C2410 - add DCLK mask definitionsBen Dooks1-0/+6
Patch from Ben Dooks From: Guillaume Gourat <[email protected]> Add MASK definitions for DCLK0 and DCLK1 Signed-off-by: Guillaume Gourat <[email protected]> Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Russell King <[email protected]>
2005-10-20[ARM] 3026/1: S3C2410 - avoid possible overflow in pll calculationsBen Dooks1-4/+11
Patch from Ben Dooks Avoid the possiblity that if the board is using a 16.9334 or higher crystal with a high PLL multiplier, then the pll value could overflow the capability of an int. Also fix the value types of the intermediate variables to unsigned int. Rewrite of patch from Guillaume Gourat Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Russell King <[email protected]>
2005-10-20Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6Trond Myklebust3-3/+44
2005-10-20[PATCH] Fix handling spurious page fault for hugetlb regionHugh Dickins1-13/+3
This reverts commit 3359b54c8c07338f3a863d1109b42eebccdcf379 and replaces it with a cleaner version that is purely based on page table operations, so that the synchronization between inode size and hugetlb mappings becomes moot. Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2005-10-20Merge branch 'master'Jeff Garzik6-10/+52
2005-10-20Merge branch 'master'Jeff Garzik6-10/+52
2005-10-19Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-1/+1
2005-10-19[PATCH] swiotlb: make sure initial DMA allocations really are in DMA memoryYasunori Goto1-2/+30
This introduces a limit parameter to the core bootmem allocator; The new parameter indicates that physical memory allocated by the bootmem allocator should be within the requested limit. We also introduce alloc_bootmem_low_pages_limit, alloc_bootmem_node_limit, alloc_bootmem_low_pages_node_limit apis, but alloc_bootmem_low_pages_limit is the only api used for swiotlb. The existing alloc_bootmem_low_pages() api could instead have been changed and made to pass right limit to the core allocator. But that would make the patch more intrusive for 2.6.14, as other arches use alloc_bootmem_low_pages(). We may be done that post 2.6.14 as a cleanup. With this, swiotlb gets memory within 4G for both x86_64 and ia64 arches. Signed-off-by: Yasunori Goto <[email protected]> Cc: Ravikiran G Thirumalai <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2005-10-19[PATCH] Handle spurious page fault for hugetlb regionSeth, Rohit1-0/+13
The hugetlb pages are currently pre-faulted. At the time of mmap of hugepages, we populate the new PTEs. It is possible that HW has already cached some of the unused PTEs internally. These stale entries never get a chance to be purged in existing control flow. This patch extends the check in page fault code for hugepages. Check if a faulted address falls with in size for the hugetlb file backing it. We return VM_FAULT_MINOR for these cases (assuming that the arch specific page-faulting code purges the stale entry for the archs that need it). Signed-off-by: Rohit Seth <[email protected]> [ This is apparently arguably an ia64 port bug. But the code won't hurt, and for now it fixes a real problem on some ia64 machines ] Signed-off-by: Linus Torvalds <[email protected]>
2005-10-18RPCSEC_GSS: krb5 cleanupJ. Bruce Fields1-8/+4
Remove some senseless wrappers. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18RPCSEC_GSS remove all qop parametersJ. Bruce Fields4-27/+8
Not only are the qop parameters that are passed around throughout the gssapi unused by any currently implemented mechanism, but there appears to be some doubt as to whether they will ever be used. Let's just kill them off for now. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18RPCSEC_GSS: Add support for privacy to krb5 rpcsec_gss mechanism.J. Bruce Fields1-1/+17
Add support for privacy to the krb5 rpcsec_gss mechanism. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18RPCSEC_GSS: krb5 pre-privacy cleanupJ. Bruce Fields1-3/+2
The code this was originally derived from processed wrap and mic tokens using the same functions. This required some contortions, and more would be required with the addition of xdr_buf's, so it's better to separate out the two code paths. In preparation for adding privacy support, remove the last vestiges of the old wrap token code. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18RPCSEC_GSS: cleanup au_rslack calculationJ. Bruce Fields1-1/+6
Various xdr encode routines use au_rslack to guess where the reply argument will end up, so we can set up the xdr_buf to recieve data into the right place for zero copy. Currently we calculate the au_rslack estimate when we check the verifier. Normally this only depends on the verifier size. In the integrity case we add a few bytes to allow for a length and sequence number. It's a bit simpler to calculate only the verifier size when we check the verifier, and delay the full calculation till we unwrap. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18SUNRPC: Provide a callback to allow free pages allocated during xdr encodingJ. Bruce Fields1-1/+4
For privacy, we need to allocate pages to store the encrypted data (passed in pages can't be used without the risk of corrupting data in the page cache). So we need a way to free that memory after the request has been transmitted. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18SUNRPC: Add support for privacy to generic gss-api code.J. Bruce Fields1-0/+22
Add support for privacy to generic gss-api code. This is dead code until we have both a mechanism that supports privacy and code in the client or server that uses it. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18Merge branch 'upstream'Jeff Garzik79-317/+326
2005-10-18[PATCH] sgiseeq: Configure PIO and DMA timing requests.Ralf Baechle1-20/+20
Signed-off-by: Ralf Baechle <[email protected]> drivers/net/sgiseeq.c | 28 ++++++++++++++-------------- include/asm-mips/sgi/hpc3.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 34 deletions(-) Signed-off-by: Jeff Garzik <[email protected]>
2005-10-18Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6Trond Myklebust3-7/+8
2005-10-18NFSv4: Eliminate nfsv4 open race...Trond Myklebust1-1/+1
Make NFSv4 return the fully initialized file pointer with the stateid that it created in the lookup w/intent. Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18VFS: Allow the filesystem to return a full file pointer on open intentTrond Myklebust1-0/+8
This is needed by NFSv4 for atomicity reasons: our open command is in fact a lookup+open, so we need to be able to propagate open context information from lookup() into the resulting struct file's private_data field. Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18NFSv4: Fix up handling of open_to_lock sequence idsTrond Myklebust1-15/+4
Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18NFSv4: Make NFS clean up byte range locks asynchronouslyTrond Myklebust1-1/+1
Currently we fail to do so if the process was signalled. Signed-off-by: Trond Myklebust <[email protected]>
2005-10-18NFSv4: Fix a potential CLOSE raceTrond Myklebust1-1/+1
Once the state_owner and lock_owner semaphores get removed, it will be possible for other OPEN requests to reopen the same file if they have lower sequence ids than our CLOSE call. This patch ensures that we recheck the file state once nfs_wait_on_sequence() has completed waiting. Signed-off-by: Trond Myklebust <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.