summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2005-11-04[PATCH] nvidiafb: Geforce 7800 series support addedCalin A. Culianu1-0/+4
This adds support for the Nvidia Geforce 7800 series of cards to the nvidiafb framebuffer driver. All it does is add the PCI device id for the 7800, 7800 GTX, 7800 GO, and 7800 GTX GO cards to the module device table for the nvidiafb.ko driver, so that nvidiafb.ko will actually work on these cards. I also added the relevant PCI device ids to linux/pci_ids.h I tested it on my 7800 GTX here and it works like a charm. I now can get framebuffer support on this card! Woo hoo!! Nothing like 200x75 text mode to make your eyes BLEED. ;) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-04Merge branch 'srp' of ↵Linus Torvalds1-0/+226
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
2005-11-04Merge branch 'for-linus' of ↵Linus Torvalds1-6/+13
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
2005-11-04Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds69-3024/+1629
2005-11-05powerpc: Merge smp.c and smp.hPaul Mackerras1-5/+32
This also moves setup_cpu_maps to setup-common.c (calling it smp_setup_cpu_maps) and uses it on both 32-bit and 64-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-04NFSv4: Fix problem with OPEN_DOWNGRADETrond Myklebust1-1/+1
RFC 3530 states that for OPEN_DOWNGRADE "The share_access and share_deny bits specified must be exactly equal to the union of the share_access and share_deny bits specified for some subset of the OPENs in effect for current openowner on the current file. Setattr is currently violating the NFSv4 rules for OPEN_DOWNGRADE in that it may cause a downgrade from OPEN4_SHARE_ACCESS_BOTH to OPEN4_SHARE_ACCESS_WRITE despite the fact that there exists no open file with O_WRONLY access mode. Fix the problem by replacing nfs4_find_state() with a modified version of nfs_find_open_context(). Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-11-04Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds5-197/+37
2005-11-04Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6Linus Torvalds1-11/+16
2005-11-04[PATCH] ARM: Reverted 2918/1: [update] Base port of Comdial MP1000 platfromRussell King2-194/+0
No longer maintained
2005-11-04[ARM] 3086/1: ixp2xxx error irq handlingDave Jiang1-1/+34
Patch from Dave Jiang This provides support for IXP2xxx error interrupt handling. Previously there was a patch to remove this (although the original stuff was broken). Well, now the error bits are needed again. These are used extensively by the micro-engine drivers according to Deepak and also we will need it for the new EDAC code that Alan Cox is trying to push into the main kernel. Re-submit of 3072/1, generated against git tree pulled today. AFAICT, this git tree pulled in all the ARM changes that's in arm.diff. Please let me know if there are additional changes. Thx! Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-04Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras5-229/+182
2005-11-04powerpc: merge tlbflush.hStephen Rothwell3-167/+146
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-04Merge with PaulusMichael Ellerman14-564/+241
2005-11-04powerpc: Fix random memory corruption in merged elf.hMichael Ellerman1-9/+13
The merged verison of ELF_CORE_COPY_REGS is basically the PPC64 version, with a memset that came from PPC and a few types abstracted out into #defines. But it's not _quite_ right. The first problem is we calculate the number of registers with: nregs = sizeof(struct pt_regs) / sizeof(ELF_GREG_TYPE) For a 32-bit process on a 64-bit kernel that's bogus because the registers are 64 bits, but ELF_GREG_TYPE is u32, so nregs == 88 which is wrong. The other problem is the memset, which assumes a struct pt_regs is smaller than a struct elf_regs. For a 32-bit process on a 64-bit kernel that's false. The fix is to calculate the number of regs using sizeof(unsigned long), which should always be right, and just memset the whole damn thing _before_ copying the registers in. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-04powerpc: Implement smp_release_cpus() in C not asmMichael Ellerman1-0/+1
There's no reason for smp_release_cpus() to be asm, and most people can make more sense of C code. Add an extern declaration to smp.h and remove the custom one in machine_kexec.c Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds1-11/+9
2005-11-04powerpc: merge tlb.hStephen Rothwell2-62/+36
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03[ARM] Merge SMP treeRussell King1-1/+2
2005-11-03[ARM SMP] Do not clear cpu_vm_mask for VIPT cachesRussell King1-1/+2
Since we do not invalidate TLBs/caches on MM switches, we should not clear the cpu_vm_mask for the CPU. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Fix another build error with IOP3xx platformsRussell King1-1/+1
ld doesn't like comments starting with // in its scripts Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03powerpc: Cleanup vpa codeMichael Ellerman1-8/+0
register_vpa() doesn't actually do a VPA register call it just uses the flags you pass it, so rename it to vpa_call() to be clearer. We can then define register_vpa() and unregister_vpa() which are both simple wrappers around vpa_call(). (we'll need unregister_vpa() for kexec soon) We can then cleanup vpa_init(), and because vpa_init() is only called from platforms/pseries we remove the definition in asm-ppc64/smp.h. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-03powerpc: Add helper functions for synthesising instructions at runtimeMichael Ellerman1-0/+48
There's a few places already, and soon will be more, where we synthesise branch instructions at runtime. Rather than doing it by hand in each case, it would make sense to have one implementation. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-03Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras11-539/+233
2005-11-03powerpc: merge ucontext.hStephen Rothwell3-49/+40
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03[PATCH] powerpc: Keep fixing merged ipcbuf.hDavid Gibson1-1/+2
Oops, replacing the two u64s in struct ipc64_perm with __u32s changed the alignment of that structure, which could mess up userspace. Revert to using two unsigned long longs (which is what ppc32 had originally). ppc64 orignally had two unsigned longs, but long long is the same size on 64 bit, so this should be ok there too. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-03[PATCH] ppc32 8xx: Fix harmless warning in 8xx_io/commproc.cMarcelo Tosatti1-0/+2
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-03powerpc: merge sigcontext.hStephen Rothwell2-33/+23
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03powerpc: move include/asm-ppc64/ppc32.h to arch/powerpc/kernelStephen Rothwell1-138/+0
It is only included by signal_32.c Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03powerpc: merge ptrace.hStephen Rothwell3-206/+105
Move struct ptregs32 into asm-ppc64/ppc32.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03powerpc: merge stat.hStephen Rothwell3-129/+81
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2005-11-03powerpc: Merge asm-ppc/kexec.h and asm-ppc64/kexec.hMichael Ellerman3-81/+49
Merge include/asm-ppc/kexec.h and include/asm-ppc64/kexec.h. The only thing that's really changed is that we now allocate crash_notes properly on PPC32. It's address is exported via sysfs, so it's not correct for it to be a pointer. I've also removed some of the "we don't use this" comments, because they're wrong (or perhaps were referring only to arch code). Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-03powerpc: Move plpar_wrappers.h into arch/powerpc/platforms/pseriesMichael Ellerman1-120/+0
Move plpar_wrappers.h into arch/powerpc/platforms/pseries, fixup white space, and update callers. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-03powerpc: Make set_dabr() a ppc_md functionMichael Ellerman1-0/+1
Move pSeries specific code in set_dabr() into a ppc_md function, this will allow us to keep plpar_wrappers.h private to platforms/pseries. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
2005-11-03powerpc: Merge remaining RTAS codePaul Mackerras1-24/+4
This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since cell wants them as well as pseries (and chrp can use rtas-proc.c too, at least in principle). rtas_fw.c is gone, with its bits moved into rtas_flash.c and rtas.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-03[XFS] Add a mechanism for XFS to use the generic quota sync method.Nathan Scott1-0/+1
This is now used to issue a delayed allocation flush before reporting quota, which allows the used space quota report to match reality. Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Add the project quota type into the XFS quota header.Nathan Scott1-1/+2
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Update XFS quota header license to match the SGI boilerplate.Nathan Scott1-10/+6
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds6-38/+56
2005-11-02Merge branch 'swiotlb' of ↵Linus Torvalds2-4/+35
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2005-11-02[ETHERNET]: Add ether stuff to docbookStephen Hemminger1-9/+15
Fix up etherdevice docbook comments and make them (and other networking stuff) get dragged into the kernel-api. Delete the old 8390 stuff, it really isn't interesting anymore. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2005-11-02[ETHERNET]: Optimize is_broadcast_ether_addrStephen Hemminger1-2/+1
Optimize the match for broadcast address by using bit operations instead of comparison. This saves a number of conditional branches, and generates smaller code. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2005-11-02[ARM SMP] Add hotplug CPU infrastructureRussell King2-0/+11
This patch adds the infrastructure to support hotplug CPU on ARM platforms. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02IB: Add SCSI RDMA Protocol (SRP) initiatorRoland Dreier1-0/+226
Add an InfiniBand SCSI RDMA Protocol (SRP) initiator. This driver is used to talk talk to InfiniBand SRP targets (storage devices). Signed-off-by: Roland Dreier <rolandd@cisco.com>
2005-11-02[ARM SMP] Track CPU idle threadsRussell King1-0/+1
Track the idle thread task_struct for each CPU. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02Merge git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds1-5/+5
2005-11-02[ARM] Fix ARM rwlock implementationsRussell King1-3/+3
fb1c8f93d869b34cacb8b8932e2b83d96a19d720 broke the ARM rwlock code since it only partially updated the rwlock implementation. Properly update it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] 3083/1: include/asm-arm/arch-ixp4xx/io.h: eliminate warnings for ↵John Bowler1-34/+40
pointer passed to integral function argument Patch from John Bowler Fix for a compiler warning, this wasn't apparent in 2.6.12, I believe the compiler options have been changed (somewhere) so that passing a (void*) to a (u32) argument is now warned. This accounts for the majority of the warnings in my builds of the 2.6.14 kernel for NSLU2. The patch changes pointer parameters declared as u32 to be declared as either, for read parameters: const volatile void __iomem * and for write parameters: volatile void __iomem * Signed-off-by: John Bowler <jbowler@acm.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] Fix realview machine type for patch 3060/1Russell King1-1/+1
Realview was missed in this cleanup... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02Merge Paulus' treeStephen Rothwell14-124/+76
2005-11-01[PATCH] missing platform_device.h includesAl Viro1-0/+2
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:53:26 +0000