aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'intelfb-patches' of ↵Linus Torvalds2006-09-30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6: intelfbhw.c: intelfbhw_get_p1p2 defined but not used intelfb: fix mtrr_reg signedness intelfb: update doc and Kconfig (supported devices) intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add preliminary i2c support intelfb: add vsync interrupt support intelfb: add vsync interrupt support intelfb: add vsync interrupt support intelfb: add vsync interrupt support intelfb: add vsync interrupt support
| * intelfbhw.c: intelfbhw_get_p1p2 defined but not usedParag Warudkar2006-08-21
| | | | | | | | | | | | | | intelfbhw_get_p1p2 is used only if REGDUMP is defined - compile it in only if REGDUMP is defined - one less compiler warning. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: fix mtrr_reg signednessDave Airlie2006-08-21
| | | | | | | | | | | | | | This is my fix for gcc 4.1 sign issue reported by Eric Sesterhenn <snakebyte@gmx.de>. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: update doc and Kconfig (supported devices)Christian Merkle2006-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | According to drivers/video/intelfb/intelfb.h, the intelfb driver supportes the following devices: 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM. So the description in drivers/video/Kconfig and the documentation in Documentation/fb/intelfb.txt is outdated. airlied: cleaned up some other obvious mistakes in intelfb.txt. Signed-off-by: Christian Merkle <mail@christian-merkle.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | Adds code to unregister the I2C buses in the cleanup function. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | | | [07/07] intelfb: adds an option to enable I2C support in the intelfb driver. Also adds the intel_i2c.c file to the Makefile. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | | | [06/07] intelfb: adds intelfb_i2c.c which contains the infrastructure needed to enumerate the i2c busses on the intelfb. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | [05/07] intelfb: add output fields to dinfo. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | | | [04/07] intelfb: add intelfb_output_rec struct and the constants for it's fields. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | [03/07] intelfb: add intelfb_i2c_chan struct. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | [02/07] intelfb: add GPIO registers. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add preliminary i2c supportDennis Munsie2006-07-03
| | | | | | | | | | | | | | | | [01/07] i2c: add intelfb bit algorithm id Adds the intelfb bit algorithm id to i2c-id.h. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| * intelfb: add vsync interrupt supportEric Hustvedt2006-07-03
| | | | | | | | | | | | | | | | [05/05] intelfb: Honor FB_ACTIVATE_VBL for display panning Extends the intelfb_vsync struct to store panning offset. The interrupt service routine uses the stored panning offset if a pan is requested for the vsync. intelfbhw_disable_irq also pans the display if there is a pending request. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
| * intelfb: add vsync interrupt supportEric Hustvedt2006-07-03
| | | | | | | | | | | | | | | | [04/05] intelfb: implement FBIO_WAITFORVSYNC ioctl The (unofficial) FBIO_WAITFORVSYNC ioctl is implemented by sleeping on the appropriate waitqueue, as defined in my earlier patch. Currently, only display 0 (aka pipe A) is supported. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
| * intelfb: add vsync interrupt supportEric Hustvedt2006-07-03
| | | | | | | | | | | | | | | | | | | | | | | | [03/05] intelfb: Implement basic interrupt handling Functions have been added to enable and disable interrupts using the MMIO registers. Currently only pipe A vsync interrupts are enabled. A generalized vsync accounting struct is defined, with the intent that it can encapsulate per-pipe vsync related info in the future. Currently a single instance is hard-coded. The interrupt service routine currently only looks for vsync interrupts on pipe A, and increments a counter and wakes up anyone waiting on it. This implementation is heavily influenced by similar implementations in the atyfb and matroxfb drivers. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
| * intelfb: add vsync interrupt supportEric Hustvedt2006-07-03
| | | | | | | | | | | | | | | | | | | | [02/05] intelfb: Add interrupt related register definitions Add constants for accessing HWSTAM, IER, IIR, and IMR registers. Add constants for interrupt types supported by the 8xx and 9xx chipsets. The registers are also stored in the hwstate struct and dumped in the debug routine. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
| * intelfb: add vsync interrupt supportEric Hustvedt2006-07-03
| | | | | | | | | | | | | | | | [01/05] intelfb: Add 16-bit register access macros This patch adds macros to read and write two-byte MMIO registers. The interrupt-related registers are all word-sized, rather than long-sized. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
* | Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6Linus Torvalds2006-09-30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] Use early clobber in semaphores [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it [PATCH] Re-positioning the bss segment [PATCH] Use ARRAY_SIZE in setup.c [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE() [PATCH] x86: Clean up x86 NMI sysctls [PATCH] Refactor some duplicated code in mpparse.c [PATCH] Document iommu=panic [PATCH] Fix broken indentation in iommu_setup [PATCH] Allow disabling DAC using command line options [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic [PATCH] i386: Update defconfig [PATCH] Update defconfig
| * | [PATCH] Use early clobber in semaphoresAndi Kleen2006-09-29
| | | | | | | | | | | | | | | New code clobbers the result always early, so tell gcc about it Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Define vsyscall cache as blob to make clearer that user space ↵Andi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | shouldn't use it Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Re-positioning the bss segmentVivek Goyal2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [AK: This apparently broke some systems, but we need it to fix a compile problem with old binutils and in theory the patch is correct. So let's trying reenabling it again.] o Currently bss segment is being placed somewhere in the middle (after .data) section and after bss lots of init section and data sections are coming. Is it intentional? o One side affect of placing bss in the middle is that objcopy keeps the bss in raw binary image (vmlinux.bin) hence unnecessarily increasing the size of raw binary image. (In my case ~600K). It also increases the size of generated bzImage, though the increase is very small (896 bytes), probably a very high compression ratio for stream of zeros. o This patch moves the bss at the end hence reducing the size of bzImage by 896 bytes and size of vmlinux.bin by 600K. o This change benefits in the context of relocatable kernel patches. If kernel bss is not part of compressed data (vmlinux.bin) then it does not have to be decompressed and this area can be used by the decompressor for its execution hence keeping the memory requirements bounded and decompressor code does not stomp over any other data loaded beyond kernel image (As might be the case with bootloaders like kexec). Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Use ARRAY_SIZE in setup.cAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | Based on i386 patch from Bjorn. Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()Bjorn Helgaas2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Code is easier to validate if array sizes aren't hidden behind extra #defines. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] x86: Clean up x86 NMI sysctlsAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use prototypes in headers Don't define panic_on_unrecovered_nmi for all architectures Cc: dzickus@redhat.com Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Refactor some duplicated code in mpparse.cAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | No logic changes Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Document iommu=panicAndi Kleen2006-09-29
| | | | | | | | | | | | Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Fix broken indentation in iommu_setupAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | No functional changes; only white space. Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Allow disabling DAC using command line optionsAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | Might or might not work around some reported bugs on VIA systems. Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Add proper sparse __user casts to __copy_to_user_inatomicAndi Kleen2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Noticed by Al Viro Cc: viro@ftp.linux.org.uk Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] i386: Update defconfigAndi Kleen2006-09-29
| | | | | | | | | | | | Signed-off-by: Andi Kleen <ak@suse.de>
| * | [PATCH] Update defconfigAndi Kleen2006-09-29
| | | | | | | | | | | | Signed-off-by: Andi Kleen <ak@suse.de>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-09-29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock [ATM]: [lec] add reference counting to lec_arp entries [ATM]: [lec] use work queue instead of timer for lec arp expiry [ATM]: [lec] old_close is no longer used [ATM]: [lec] convert lec_arp_table to hlist [ATM]: [lec] header indent, comment and whitespace cleanup [ATM]: [lec] indent, comment and whitespace cleanup [continued] [ATM]: [lec] indent, comment and whitespace cleanup [SCTP]: Do not timestamp every SCTP packet. [SCTP]: Use correct mask when disabling PMTUD. [SCTP]: Include sk_buff overhead while updating the peer's receive window. [SCTP]: Enable Nagle algorithm by default. [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present. [NetLabel]: audit fixups due to delayed feedback
| * | | [ATM]: [lec] use refcnt to protect lec_arp_entries outside lockChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] add reference counting to lec_arp entriesChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] use work queue instead of timer for lec arp expiryChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] old_close is no longer usedChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] convert lec_arp_table to hlistChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] header indent, comment and whitespace cleanupChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] indent, comment and whitespace cleanup [continued]Chas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: [lec] indent, comment and whitespace cleanupChas Williams2006-09-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: Do not timestamp every SCTP packet.Vlad Yasevich2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need the timestamp on COOKIE-ECHO chunks, so instead of always timestamping every SCTP packet, let common code timestamp if the socket option is set. For COOKIE-ECHO, simply get the time of day if we don't have a timestamp. This introduces a small possibility that the cookie may be considered expired, but it will be renegotiated. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: Use correct mask when disabling PMTUD.Vlad Yasevich2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: Include sk_buff overhead while updating the peer's receive window.Sridhar Samudrala2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the sender is sending small messages, it can cause a receiver to run out of receive buffer space even when the advertised receive window is still open and results in packet drops and retransmissions. Including a overhead while updating the sender's view of peer receive window will reduce the chances of receive buffer space overshooting the receive window. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: Enable Nagle algorithm by default.Sridhar Samudrala2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows more aggressive bundling of chunks when sending small messages. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.Michael Chan2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSI is defined to be 32-bit write. The 5706 does 64-bit MSI writes with byte enables disabled on the unused 32-bit word. This is legal but causes problems on the AMD 8132 which will eventually stop responding after a while. Without this patch, the MSI test done by the driver during open will pass, but MSI will eventually stop working after a few MSIs are written by the device. AMD believes this incompatibility is unique to the 5706, and prefers to locally disable MSI rather than globally disabling it using pci_msi_quirk. Update version to 1.4.45. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NetLabel]: audit fixups due to delayed feedbackPaul Moore2006-09-29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some issues Steve Grubb had with the way NetLabel was using the audit subsystem. This should make NetLabel more consistent with other kernel generated audit messages specifying configuration changes. Signed-off-by: Paul Moore <paul.moore@hp.com> Acked-by: Steve Grubb <sgrubb@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SERIAL] sunzilog: Mark sunzilog_init_hw as __devinit.David S. Miller2006-09-29
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [SPARC]: Don't zero out tail during copy_from_user_inatomic().David S. Miller2006-09-29
|/ / | | | | | | | | | | | | | | Actually, since we use the same code for all the copying types in and out of userspace, we check at runtime whether preemption is disabled. Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] uml build fixOllie Wild2006-09-29
| | | | | | | | | | | | Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] MLSXFRM: fix mis-labelling of child socketsDavid Woodhouse2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Accepted connections of types other than AF_INET, AF_INET6, AF_UNIX won't have an appropriate label derived from the peer, so don't use it. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>