aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-17pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski1-20/+0
As per a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb, disable the long obsolete PCMCIA ioctl also for ARM. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (quatech_daqp_cs)Javier Martinez Canillas1-20/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (ni_mio_cs)Javier Martinez Canillas1-9/+1
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (ni_labpc_cs)Javier Martinez Canillas1-16/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (ni_daq_dio24)Javier Martinez Canillas1-16/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (ni_daq_700)Javier Martinez Canillas1-16/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (das08_cs)Javier Martinez Canillas1-16/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-17drivers/staging/comedi: dev_node removal (cb_das16_cs)Javier Martinez Canillas1-16/+3
Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pata_pcmcia: get rid of extra indirectionDominik Brodowski1-35/+6
We don't need ata_pcmcia_info any more. Acked-by: Jeff Garzik <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: remove suspend-related comment from yenta_socket.cDominik Brodowski1-7/+0
While pci_set_power_state() is called by the PCI core unconditionally on all PCI devices, it is not called on _any_ PCI bridge device. Therefore, it is not surprising calling pci_set_power_state() on CardBus devices causes trouble. CC: [email protected] CC: [email protected] Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex heldDominik Brodowski3-19/+19
This avoids multiple lock takings in several codepaths. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: remove pcmcia_add_device_lockDominik Brodowski1-16/+2
As all cards to pcmcia_device_add() are already locked by skt_mutex, and the critical sections inside this function are further protected by ops_mutex, there's no need to keep a third lock around. Therfore, remove pcmcia_add_device_lock. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: update gfp/slab.h includesTejun Heo3-1/+2
Implicit slab.h inclusion via percpu.h is about to go away. Make sure gfp.h or slab.h is included as necessary. Signed-off-by: Tejun Heo <[email protected]> Cc: Stephen Rothwell <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: remove unused mem_op.hDominik Brodowski4-119/+0
Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: do not autoadd root PCI bus resourcesDominik Brodowski1-6/+29
On the PCI root bus on the x86 architecture, the risk of hitting some strange system devices is too high: If a driver isn't loaded, the resources are not claimed; even if a driver is loaded, it may not request all resources or even the wrong one. We can neither trust the rest of the kernel nor ACPI/PNP and CRS parsing to get it right. Therefore, explicitly spell out what safeguards we provide, and add a safeguard to only use resources which are set up exclusively for the secondary PCI bus (non-subtractive mode): the risk of hitting system devices is quite low, as they usually aren't connected to the secondary PCI bus. CC: Jesse Barnes <[email protected]> CC: Bjorn Helgaas <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski6-101/+204
Clean up the alloc_io_space() function by moving most of it to the actual resource_ops. This allows for a bit less re-directions. Future cleanups will follow, and will make up for the code duplication currently present between rsrc_iodyn and rsrc_nonstatic (which are hardly ever built at the same time anyway, therefore no increase in built size). Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski6-117/+141
Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: move high level CIS access code to separate fileDominik Brodowski4-330/+356
No code changes. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: dev_node removal (core)Dominik Brodowski4-24/+6
Remove the dev_node declaration. We now only pass the device name to the deprecated userspace tools. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: dev_node removal (remaining drivers)Dominik Brodowski5-72/+10
As a fourth step, remove any remaining usages of dev_node_t from drivers: - ipwireless can be simplified a bit, as we do not need to pass around the (write-only) dev_node_t around. - avma1_cs can be simplified as well, if we only keep the minor number around as "priv" data, not a full-fledged struct. Acked-by: Jiri Kosina <[email protected]> Acked-by: Karsten Keil <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: dev_node removal (drivers with unregister_netdev check)Dominik Brodowski16-145/+22
As a third step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, except to determine whether register_netdev() succeeded previously. However, the function calling unregister_netdev() was only ever called by the PCMCIA core if register_netdev() succeeded previously. The lonely exception was easily fixed. CC: [email protected] CC: [email protected] Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: dev_node removal (drivers with updated printk call)Dominik Brodowski9-227/+22
As a second step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, except one printk() which can easily be replaced by a dev_info()/dev_warn() call. CC: Harald Welte <[email protected]> CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] Acked-by: Karsten Keil <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: dev_node removal (write-only drivers)Dominik Brodowski21-111/+2
dev_node_t was only used to transport some minor/major numbers from the PCMCIA device drivers to deprecated userspace helpers. However, only a few drivers made use of it, and the userspace helpers are deprecated anyways. Therefore, get rid of dev_node_t . As a first step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, but did not make use of it. CC: [email protected] CC: Harald Welte <[email protected]> CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: clean up cs.hDominik Brodowski1-11/+0
With req_irq_t gone, we can get rid of some definitions. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: re-work pcmcia_request_irq()Dominik Brodowski58-593/+244
Instead of the old pcmcia_request_irq() interface, drivers may now choose between: - calling request_irq/free_irq directly. Use the IRQ from *p_dev->irq. - use pcmcia_request_irq(p_dev, handler_t); the PCMCIA core will clean up automatically on calls to pcmcia_disable_device() or device ejection. - drivers still not capable of IRQF_SHARED (or not telling us so) may use the deprecated pcmcia_request_exclusive_irq() for the time being; they might receive a shared IRQ nonetheless. CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()Dominik Brodowski4-13/+10
As it's only used there it makes no sense relying on pcmcia_request_irq(). CC: [email protected] Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socketDominik Brodowski7-31/+17
As we don't need the "Config" counter any more, we can simplify struct pcmcia_socket. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: setup IRQ to be used by PCMCIA drivers at card insertDominik Brodowski4-94/+140
Setup the IRQ to be used by PCMCIA drivers already during the device registration stage, making use of a new function pcmcia_setup_irq(). This will allow us to get rid of quite a lot of indirection in the future. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-10pcmcia: remove unused IRQ modification featureDominik Brodowski1-13/+3
The IRQ modification feature was unused, and I see no reason to keep it. Signed-off-by: Dominik Brodowski <[email protected]>
2010-05-09Linux 2.6.34-rc7Linus Torvalds1-1/+1
2010-05-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds7-17/+62
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error [SCSI] scsi_debug: virtual_gb ignores sector_size [SCSI] libiscsi: regression: fix header digest errors [SCSI] fix locking around blk_abort_request() [SCSI] advansys: fix narrow board error path
2010-05-09cpuidle: Fix incorrect optimizationArjan van de Ven1-5/+4
commit 672917dcc78 ("cpuidle: menu governor: reduce latency on exit") added an optimization, where the analysis on the past idle period moved from the end of idle, to the beginning of the new idle. Unfortunately, this optimization had a bug where it zeroed one key variable for new use, that is needed for the analysis. The fix is simple, zero the variable after doing the work from the previous idle. During the audit of the code that found this issue, another issue was also found; the ->measured_us data structure member is never set, a local variable is always used instead. Signed-off-by: Arjan van de Ven <[email protected]> Cc: Corrado Zoccolo <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-05-07Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2-3/+9
* 'for-linus' of git://neil.brown.name/md: md: restore ability of spare drives to spin down. md/raid6: Fix raid-6 read-error correction in degraded state
2010-05-07Merge branch 'urgent' of ↵Linus Torvalds3-13/+11
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: fix compilation after 16bit state locking changes pcmcia: order userspace suspend and resume requests pcmcia: avoid pccard_validate_cis failure in resume callpath
2010-05-07Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds3-5/+7
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: blk-cgroup: Fix an RCU warning in blkiocg_create() blk-cgroup: Fix RCU correctness warning in cfq_init_queue() drbd: don't expose failed local READ to upper layers
2010-05-07Merge branch 'drm-linus' of ↵Linus Torvalds4-61/+4
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/ttm: Remove the ttm_bo_block_reservation() function. drm/ttm: Remove some leftover debug messages. drm/radeon: async event synchronization for drmWaitVblank
2010-05-07virtio: initialize earlierStijn Tintel1-1/+1
Move initialization of the virtio framework before the initialization of mtd, so that block2mtd can be used on virtio-based block devices. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15644 Signed-off-by: Stijn Tintel <[email protected]> Signed-off-by: Rusty Russell <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-05-07Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds1-35/+51
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix RCU issues in the NFSv4 delegation code NFSv4: Fix the locking in nfs_inode_reclaim_delegation()
2010-05-07Merge branch 'release' of ↵Linus Torvalds8-26/+160
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x ACPI: fix acpi_hest_firmware_first_pci() caused oops sbshc: acpi_device_class "smbus_host_controller" too long power_meter: acpi_device_class "power_meter_resource" too long acpi_pad: "processor_aggregator" name too long PNP: don't check for conflicts with bridge windows ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads PNPACPI: compute Address Space length rather than using _LEN ACPI: silence kmemcheck false positive
2010-05-07Merge branch 'v4l_for_2.6.34' of ↵Linus Torvalds21-65/+90
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: V4L/DVB: pxa_camera: move fifo reset direct before dma start V4L/DVB: video: testing unsigned for less than 0 V4L/DVB: mx1-camera: compile fix V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" V4L/DVB: ngene: Workaround for stuck DiSEqC pin V4L/DVB: saa7146: fix regression of the av7110/budget-av driver V4L/DVB: v4l: fix config dependencies: mxb and saa7191 are V4L2 drivers, not V4L1 V4L/DVB: feature-removal: announce videotext.h removal V4L/DVB: V4L - vpfe capture - fix for kernel crash V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver V4L/DVB: gspca - sn9c20x: Correct onstack wait_queue_head declaration V4L/DVB: saa7146: fix up bytesperline if it is an impossible value V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails V4L/DVB: V4L - Makfile:Removed duplicate entry of davinci V4L/DVB: omap24xxcam: potential buffer overflow
2010-05-07Merge branch 'core-fixes-for-linus' of ↵Linus Torvalds6-10/+43
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: create rcu_my_thread_group_empty() wrapper memcg: css_id() must be called under rcu_read_lock() cgroup: Check task_lock in task_subsys_state() sched: Fix an RCU warning in print_task() cgroup: Fix an RCU warning in alloc_css_id() cgroup: Fix an RCU warning in cgroup_path() KEYS: Fix an RCU warning in the reading of user keys KEYS: Fix an RCU warning
2010-05-07md: restore ability of spare drives to spin down.NeilBrown1-2/+8
Some time ago we stopped the clean/active metadata updates from being written to a 'spare' device in most cases so that it could spin down and say spun down. Device failure/removal etc are still recorded on spares. However commit 51d5668cb2e3fd1827a55 broke this 50% of the time, depending on whether the event count is even or odd. The change log entry said: This means that the alignment between 'odd/even' and 'clean/dirty' might take a little longer to attain, how ever the code makes no attempt to create that alignment, so it could take arbitrarily long. So when we find that clean/dirty is not aligned with odd/even, force a second metadata-update immediately. There are already cases where a second metadata-update is needed immediately (e.g. when a device fails during the metadata update). We just piggy-back on that. Reported-by: Joe Bryant <[email protected]> Signed-off-by: NeilBrown <[email protected]> Cc: [email protected]
2010-05-07md/raid6: Fix raid-6 read-error correction in degraded stateGabriele A. Trombetti1-1/+1
Fix: Raid-6 was not trying to correct a read-error when in singly-degraded state and was instead dropping one more device, going to doubly-degraded state. This patch fixes this behaviour. Tested-by: Janos Haar <[email protected]> Signed-off-by: Gabriele A. Trombetti <[email protected]> Reported-by: Janos Haar <[email protected]> Signed-off-by: NeilBrown <[email protected]> Cc: [email protected]
2010-05-07blk-cgroup: Fix an RCU warning in blkiocg_create()Li Zefan1-4/+4
with CONFIG_PROVE_RCU=y, a warning can be triggered: # mount -t cgroup -o blkio xxx /mnt # mkdir /mnt/subgroup ... kernel/cgroup.c:4442 invoked rcu_dereference_check() without protection! ... To fix this, we avoid caling css_depth() here, which is a bit simpler than the original code. Signed-off-by: Li Zefan <[email protected]> Acked-by: Vivek Goyal <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2010-05-06Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', ↵Len Brown596-3088/+8675
'bugzilla-15903' and 'misc-2.6.34' into release
2010-05-07drm/ttm: Remove the ttm_bo_block_reservation() function.Thomas Hellstrom2-57/+1
It's unused and buggy in its current form, since it can place a bo in the reserved state without removing it from lru lists. Signed-off-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-07drm/ttm: Remove some leftover debug messages.Thomas Hellstrom1-4/+1
Signed-off-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-07drm/radeon: async event synchronization for drmWaitVblankJerome Glisse1-0/+2
Bring radeon up to speed with the async event synchronization for drmWaitVblank. See c9a9c5e02aedc1a2815877b0268f886d2640b771 for more information. Without this patch event never get delivered to userspace client. Signed-off-by: Jerome Glisse <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-06V4L/DVB: pxa_camera: move fifo reset direct before dma startStefan Herbrechtsmeier1-5/+6
Move the fifo reset from pxa_camera_start_capture to pxa_camera_irq direct before the dma start after an end of frame interrupt to prevent images from shifting because of old data at the begin of the frame. Signed-off-by: Stefan Herbrechtsmeier <[email protected]> Acked-by: Robert Jarzmik <[email protected]> Tested-by: Antonio Ospite <[email protected]> Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-06V4L/DVB: video: testing unsigned for less than 0Dan Carpenter1-1/+1
soc_mbus_bytes_per_line() returns -EINVAL on error but we store it in an unsigned int so the test for less than zero doesn't work. I think it always returns "small" positive values so we can just cast it to int here. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.