summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] mm: remove VM_LOCKED before remap_pfn_range and drop VM_SHMChristoph Lameter2006-06-254-6/+1
| | | | | | | | | | | | | | | | | Remove VM_LOCKED before remap_pfn range from device drivers and get rid of VM_SHM. remap_pfn_range() already sets VM_IO. There is no need to set VM_SHM since it does nothing. VM_LOCKED is of no use since the remap_pfn_range does not place pages on the LRU. The pages are therefore never subject to swap anyways. Remove all the vm_flags settings before calling remap_pfn_range. After removing all the vm_flag settings no use of VM_SHM is left. Drop it. Signed-off-by: Christoph Lameter <clameter@sgi.com> Acked-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] ieee1394: nodemgr: do not peek into struct semaphoreStefan Richter2006-06-252-2/+5
| | | | | | | | | | | Also revert patch "frv: ieee1394 is borken on frv", as it no longer is. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Cc: David Howells <dhowells@redhat.com> Cc: Jody McIntyre <scjody@modernduck.com> Cc: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-06-242-4/+148
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits) [ARM] 3648/1: Update struct ucontext layout for coprocessor registers [ARM] Add identifying number for non-rt sigframe [ARM] Gather common sigframe saving code into setup_sigframe() [ARM] Gather common sigframe restoration code into restore_sigframe() [ARM] Re-use sigframe within rt_sigframe [ARM] Merge sigcontext and sigmask members of sigframe [ARM] Replace extramask with a full copy of the sigmask [ARM] Remove rt_sigframe puc and pinfo pointers [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines [ARM] 3645/1: S3C2412: irq support for external interrupts [ARM] 3643/1: S3C2410: Add new usb clocks [ARM] 3642/1: S3C24XX: Add machine SMDK2413 [ARM] 3641/1: S3C2412: Fixup gpio register naming [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON [ARM] 3639/1: S3C2412: serial port support [ARM] 3638/1: S3C2412: core clocks [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926 [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos ...
| * [ARM] 3639/1: S3C2412: serial port supportBen Dooks2006-06-242-4/+148
| | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Serial port support for the on-board UART blocks on the Samsung S3C2412 and S3C2413 UARTs. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer"Linus Torvalds2006-06-241-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 786dc1d3d7333f269e17d742886eac2188a2d9cc. As Al so eloquently points out, the patch is crap. The old code was fine, the new code was bogus. It never dereferenced a user pointer, the "->" operator was to an array member, which gives the _address_ of the member (in user space), not an actual dereference at all. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge branch 'drm-patches' of ↵Linus Torvalds2006-06-248-12/+142
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: radeon constify radeon microcode Add i915 ioctls to configure pipes for vblank interrupt. drm: update radeon to 1.25 add r200 vertex program support drm: radeon add a tcl state flush before accessing tcl vector space
| * | drm: radeon constify radeon microcodeDave Airlie2006-06-241-3/+3
| | | | | | | | | | | | | | | From: Tilman (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | Add i915 ioctls to configure pipes for vblank interrupt.Dave Airlie2006-06-244-5/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | i915 vblanks can be generated from either pipe a or b, however a disabled pipe generates no interrupts. This change allows the X server to select which pipe generates vblank interrupts. From: Keith Packard <keith.packard@intel.com> via DRM CVS Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: update radeon to 1.25 add r200 vertex program supportDave Airlie2006-06-243-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new packet type for making it possible to address whole tcl vector space and have a larger count) From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: radeon add a tcl state flush before accessing tcl vector spaceDave Airlie2006-06-242-2/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | Do a tcl state flush before accessing tcl vector space. This fixes some more problems with flickering (bug #6637). drm may not be appropriate place for this, since doing that flush there might both be overkill and insufficient in some cases. However, it's hard to figure out when that flush is needed, so this has to suffice. There does not seem to be a performance penalty associated with it. From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge branch 'intelfb-patches' of ↵Linus Torvalds2006-06-243-24/+20
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: intelfb delousing
| * | intelfb delousingAl Viro2006-06-243-24/+20
| |/ | | | | | | | | | | | | | | | | ring_head is offset in card memory, not iomem pointer. Fixed, removed fuckloads of amazingly bogus casts somebody had sprinkled all over the place. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-06-2431-1687/+1444
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits) [SPARC64]: Update defconfig. [SPARC64]: Make auxio a real driver. [PARPORT] sunbpp: Convert to new SBUS device framework. [Documentation]: Update probing info in sbus_drivers.txt [SCSI] qlogicpti: Convert to new SBUS device framework. [SCSI] esp: Fix bug in esp_remove_common. [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). [NET] myri_sbus: Kill unused next_module struct member. [NET] myri_sbus: Convert to new SBUS device layer. [NET] sunqe: Convert to new SBUS driver layer. [NET] sunbmac: Convert over to new SBUS device framework. [NET] sunlance: Convert to new SBUS driver framework. [NET] sunhme: Convert to new SBUS driver framework. [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. [SCSI] sparc: Port esp to new SBUS driver layer. [SOUND] sparc: Port amd7930 to new SBUS device layer. [SBUS]: Rewrite and plug into of_device framework. [SPARC]: Port of_device layer and make ebus use it. [SPARC]: Port sparc64 in-kernel device tree code to sparc32. [SPARC64]: Add of_device layer and make ebus/isa use it. ...
| * | [PARPORT] sunbpp: Convert to new SBUS device framework.David S. Miller2006-06-231-64/+70
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] qlogicpti: Convert to new SBUS device framework.David S. Miller2006-06-231-175/+186
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] esp: Fix bug in esp_remove_common.David S. Miller2006-06-231-4/+1
| | | | | | | | | | | | | | | | | | Do not try to kfree(esp), scsi_host_put() takes care of that. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().David S. Miller2006-06-231-14/+0
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] myri_sbus: Kill unused next_module struct member.David S. Miller2006-06-231-1/+0
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] myri_sbus: Convert to new SBUS device layer.David S. Miller2006-06-231-55/+61
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunqe: Convert to new SBUS driver layer.David S. Miller2006-06-231-249/+219
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunbmac: Convert over to new SBUS device framework.David S. Miller2006-06-232-67/+61
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunlance: Convert to new SBUS driver framework.David S. Miller2006-06-231-76/+97
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Convert to new SBUS driver framework.David S. Miller2006-06-232-174/+187
| | | | | | | | | | | | | | | | | | And make it a real PCI driver too. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.David S. Miller2006-06-231-12/+12
| | | | | | | | | | | | | | | | | | Use CONFIG_SPARC and CONFIG_SPARC64 instead. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] sparc: Port esp to new SBUS driver layer.David S. Miller2006-06-232-165/+157
| | | | | | | | | | | | | | | | | | This also turns the driver into a new-style scsi driver. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SBUS]: Rewrite and plug into of_device framework.David S. Miller2006-06-231-310/+139
| | | | | | | | | | | | | | | | | | | | | I severely apologize, I was still learning how to program in C when I wrote this stuff 10 years ago... Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC]: Port sparc64 in-kernel device tree code to sparc32.David S. Miller2006-06-231-0/+1
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Add of_device layer and make ebus/isa use it.David S. Miller2006-06-232-96/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert central bus layer to in-kernel PROM device tree.David S. Miller2006-06-231-1/+1
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Use in-kernel PROM tree for EBUS and ISA.David S. Miller2006-06-2310-67/+64
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.David S. Miller2006-06-236-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert sun4v virtual-device layer to in-kernel PROM device tree.David S. Miller2006-06-231-17/+18
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SBUS]: Start cleaning up generic sbus support layer.David S. Miller2006-06-231-124/+19
| |/ | | | | | | | | | | | | In particular, move the IRQ probing out to sparc32/sparc64 arch specific code where it belongs. Signed-off-by: David S. Miller <davem@davemloft.net>
* | Enable minimal per-device resume tracingLinus Torvalds2006-06-241-0/+4
| | | | | | | | | | | | | | | | | | This is the minimal resume trace code to find which device resume (if any) results in problems. Usually, you'd use the information this generates as a starting point to adding more fine-grained trace event points. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Add some basic resume trace facilitiesLinus Torvalds2006-06-242-0/+229
|/ | | | | | | | | | Considering that there isn't a lot of hw we can depend on during resume, this is about as good as it gets. This is x86-only for now, although the basic concept (and most of the code) will certainly work on almost any platform. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fix typo in acpi video brightness changes.Dave Jones2006-06-231-1/+1
| | | | | | | Prevent possible null dereference due to misplaced ; Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-06-2326-2181/+6032
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (258 commits) [libata] conversion to new debug scheme, part 1 of $N [PATCH] libata: Add ata_scsi_dev_disabled [libata] Add host lock to struct ata_port [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] [PATCH] libata-dev: move the CDB-intr DMA blacklisting [PATCH] ahci: disable NCQ support on vt8251 [libata] ahci: add JMicron PCI IDs [libata] sata_nv: add PCI IDs [libata] ahci: Add NVIDIA PCI IDs. [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 [PATCH] sata_via: convert to new EH, take #3 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler [PATCH] sata_nv: add hotplug support [PATCH] sata_nv: convert to new EH [PATCH] sata_nv: better irq handlers [PATCH] sata_nv: simplify constants [PATCH] sata_nv: kill struct nv_host_desc and nv_host [PATCH] sata_nv: kill not-working hotplug code [libata] Update docs to reflect current driver API [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 ...
| * [libata] conversion to new debug scheme, part 1 of $NBorislav Petkov2006-06-231-26/+47
| | | | | | | | | | | | | | | | | | The first 25% of libata-core.c converted to the new debugging scheme. Signed-off-by: <petkov@math.uni-muenster.de> (with addition of ATA_MSG_WARN to standard msg_enable by me) Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: Add ata_scsi_dev_disabledBrian King2006-06-221-10/+31
| | | | | | | | | | | | | | | | | | | | Separate out parts of ata_scsi_find_dev to be reused in future SAS/SATA patches. Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Brian King <brking@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] Add host lock to struct ata_portJeff Garzik2006-06-224-73/+72
| | | | | | | | | | | | | | | | | | | | | | | | Prepare for changes required to support SATA devices attached to SAS HBAs. For these devices we don't want to use host_set at all, since libata will not be the owner of struct scsi_host. Signed-off-by: Brian King <brking@us.ibm.com> (with slight merge modifications made by...) Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[]Tejun Heo2006-06-221-16/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the only per-dev EH action is REVALIDATE. EH used to exploit ehi->dev to do selective revalidation on a ATA bus. However, this is a bit hacky and makes it impossible to request selective revalidation from outside of EH or add another per-dev EH action. This patch adds per-dev EH action mask eh_info->dev_action[] and update EH to use this field for REVALIDATE. Note that per-dev actions can still be specified at port-level and it has the same effect of specifying the action for all devices on the port. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata-dev: move the CDB-intr DMA blacklistingAlbert Lee2006-06-221-10/+9
| | | | | | | | | | | | | | | | Move the DMA blacklisting of the CDB-intr devices from ata_check_atapi_dma() to ata_dma_blacklisted(), where it makes more sense. Signed-off-by: Albert Lee <albertcc@tw.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] ahci: disable NCQ support on vt8251Tejun Heo2006-06-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | vt8251 chokes on NCQ commands. Two different disks from different vendors are showing the same symptom and it seems that the windows driver from via doesn't support NCQ either. Disable NCQ support on this controller for the time being. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Aalderd Bouwman <boac@wanadoo.nl> Cc: Bastiaan Jacques <b.jacques@planet.nl> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] ahci: add JMicron PCI IDsJeff Garzik2006-06-221-0/+6
| | | | | | | | | | | | Originally contributed by Justin @ JMicron. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] sata_nv: add PCI IDsJeff Garzik2006-06-221-0/+4
| | | | | | | | | | | | Based on a patch contributed by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] ahci: Add NVIDIA PCI IDs.Jeff Garzik2006-06-221-0/+18
| | | | | | | | | | | | Based on a patch by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Merge branch 'master' into upstreamJeff Garzik2006-06-22679-67170/+49213
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
| * | [PATCH] libata: convert several bmdma-style controllers to new EH, take #3Tejun Heo2006-06-204-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert sata_sis, svw, uli and vsc drivers to new EH. All the drivers used to specify ATA_FLAG_SATA_RESET to tell libata to use SATA hardreset instead of SRST. This patch makes all the converted drivers use the standard bmdma error handler which uses both SRST and SATA hardreset. All the controllers should be able to perform SRST but still needs verification. If some of the controllers can't do SRST, it will be very easy to spot as it will show up during boot probing. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sata_via: convert to new EH, take #3Tejun Heo2006-06-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert sata_via to new EH. vt6420 used ATA_FLAG_SRST while vt6421 used ATA_FLAG_SATA_RESET. This difference seems to be an accident rather than intended. This patch makes both flavors use ata_bmdma_error_handler() which makes use of both SRST and SATA hardreset. This behavior change is intended and if it breaks anything, it should be very easy to spot. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handlerJeff Garzik2006-06-201-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to use the heavier spin lock in the irq handler. It's quite possible we can do this in nv_generic_interrupt() as well, but I didn't take the time to pursue that train of thought. Signed-off-by: Jeff Garzik <jeff@garzik.org>
OpenPOWER on IntegriCloud