aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] fix AB-BA deadlock inversion at cs46xx_dsp_remove_scbArjan van de Ven2006-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a code sequence where the locking is substream->self_group.lock -> ins->scbs[index].lock substream->self_group.lock is interrupt safe, and taken from irq context as well (trace is snipped for brevity) so what can happen is cpu 0 cpu 1 user context user context take ins->scbs[index].lock without disabling interrupts get substream->self_group.lock (irqsafe) try to get ins->scbs[index].lock (spins) interrupt happens try to get substream->self_group.lock (spins) which is an obvious AB-BA deadlock fix is to just take the lock with _irqsafe Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Jaroslav Kysela <perex@suse.cz> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] mthca: initialize send and receive queue locks separatelyZach Brown2006-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mthca: initialize send and receive queue locks separately lockdep identifies a lock by the call site of its initialization. By initializing the send and receive queue locks in mthca_wq_init() we confuse lockdep. It warns that that the ordered acquiry of both locks in mthca_modify_qp() is recursive acquiry of one lock: ============================================= [ INFO: possible recursive locking detected ] --------------------------------------------- modprobe/1192 is trying to acquire lock: (&wq->lock){....}, at: [<f892b4db>] mthca_modify_qp+0x60/0xa7b [ib_mthca] but task is already holding lock: (&wq->lock){....}, at: [<f892b4ce>] mthca_modify_qp+0x53/0xa7b [ib_mthca] Initializing the locks separately in mthca_alloc_qp_common() stops the warning and will let lockdep enforce proper ordering on paths that acquire both locks. Signed-off-by: Zach Brown <zach.brown@oracle.com> Cc: Roland Dreier <rolandd@cisco.com> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix copying of pgdat array on each node for ia64 memory hotplugYasunori Goto2006-07-04
| | | | | | | | | | | | | | | | | | | | | | | I found a bug in memory hot-add code for ia64. IA64's code has copies of pgdat's array on each node to reduce memory access over crossing node. This array is used by NODE_DATA() macro. When new node is hot-added, this pgdat's array should be updated and copied on new node too. However, I used for_each_online_node() in scatter_node_data() to copy it. This meant its array is not copied on new node. Because initialization of structures for new node was halfway, so online_node_map couldn't be set at this time. To copy arrays on new node, I changed it to check value of pgdat_list[] which is source array of copies. I tested this patch with my Memory Hotadd emulation on Tiger4. This patch is for 2.6.17-git20. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uclinux: fix proc_task()/get_proc-task() namingGreg Ungerer2006-07-04
| | | | | | | Fix changed name of proc_task() to get_proc_task(). Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'release' of ↵Linus Torvalds2006-07-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (44 commits) ACPI: remove function tracing macros from drivers/acpi/*.c ACPI: add support for Smart Battery ACPI: handle battery notify event on broken BIOS ACPI: handle AC notify event on broken BIOS ACPI: asus_acpi: add S1N WLED control ACPI: asus_acpi: correct M6N/M6R display nodes ACPI: asus_acpi: add S1N WLED control ACPI: asus_acpi: rework model detection ACPI: asus_acpi: support L5D ACPI: asus_acpi: handle internal Bluetooth / support W5A ACPI: asus_acpi: support A4G ACPI: asus_acpi: support W3400N ACPI: asus_acpi: LED display support ACPI: asus_acpi: support A3G ACPI: asus_acpi: misc cleanups ACPI: video: Remove unneeded acpi_handle from driver. ACPI: thermal: Remove unneeded acpi_handle from driver. ACPI: power: Remove unneeded acpi_handle from driver. ACPI: pci_root: Remove unneeded acpi_handle from driver. ACPI: pci_link: Remove unneeded acpi_handle from driver. ...
| * Pull smart-battery into release branchLen Brown2006-07-01
| |\
| | * ACPI: remove function tracing macros from drivers/acpi/*.cLen Brown2006-07-01
| | | | | | | | | | | | | | | | | | a few invocations appeared due to the SBS and other patches. Signed-off-by: Len Brown <len.brown@intel.com>
| | * ACPI: add support for Smart BatteryRich Townsend2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most batteries today are ACPI "Control Method" batteries, but some models ship with the older "Smart Battery" that requires this code. Rich Townsend and Bruno Ducrot were the original authors. Vladimir Lebedev updated to run on latest kernel. http://bugzilla.kernel.org/show_bug.cgi?id=3734 Signed-off-by: Len Brown <len.brown@intel.com>
| * | Pull bugzilla-3241 into release branchLen Brown2006-07-01
| |\ \
| | * | ACPI: handle battery notify event on broken BIOSVladimir Lebedev2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=3241 Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: handle AC notify event on broken BIOSChristian Lupien2006-07-01
| | |/ | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=3241 updated by Vladimir Lebedev Signed-off-by: Len Brown <len.brown@intel.com>
| | * Pull asus_acpi-0.30 into release branchLen Brown2006-07-01
| | |\
| | | * ACPI: asus_acpi: add S1N WLED controlKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | Pull acpi_device_handle_cleanup into release branchLen Brown2006-07-01
| | |\ \
| * | \ \ Pull asus_acpi-0.30 into release branchLen Brown2006-07-01
| |\ \ \ \
| | * | | | ACPI: asus_acpi: correct M6N/M6R display nodesKarol Kozimor2006-07-01
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: add S1N WLED controlKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This small patch adds back WLED control for S1N models, this was accidentally removed a while ago. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: rework model detectionKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reworks laptop model detection. This addresses the Samsung P30 issue, where the INIT method would return no object, but the implicit return in the AML interpreter would confuse the driver. It also accounts for a newer batch of Asus models whose INIT returns ACPI_TYPE_BUFFER instead of STRING. The handling is now much leaner, if we get a buffer or a string, we check against known values, in every other case we use a different path (currently DSDT signatures). The bulk of this patch is separating the string matching from asus_hotk_get_info() into a separate function. This patch properly fixes http://bugme.osdl.org/show_bug.cgi?id=5067 and http://bugme.osdl.org/show_bug.cgi?id=5092 and makes the driver fully functional again with acpi=strict on all machines. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: support L5DKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Asus L5D and thus fixes http://bugme.osdl.org/show_bug.cgi?id=4695 Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: handle internal Bluetooth / support W5AKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch creates a new file named "bluetooth" under /proc/acpi/asus/. This file controls both the internal Bluetooth adapter's presence on the USB bus and the associated LED. echo 1 > /proc/acpi/asus/bluetooth to enable, 0 to disable. Additionally, the patch add support for Asus W5A, the first model that uses this feature. Patch originally by Fernando A. P. Gomes. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: support A4GKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Asus A4G. Originally by Giuseppe Rota. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: support W3400NKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Asus W3400N. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: LED display supportKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds handling for front LED displays found on W1N and the like. Additionally, W1N is given its own model_data instance. Patch originally by Éric Burghard. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: support A3GKarol Kozimor2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Asus A3G. Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: asus_acpi: misc cleanupsKarol Kozimor2006-06-30
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the version string, copyright notices and does whitespace cleanup (it looks weird, blame Lindent). Signed-off-by: Karol Kozimor <sziwan@hell.org.pl> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | Pull kmalloc into release branchLen Brown2006-06-30
| | |\ \
| * | \ \ Pull acpi_device_handle_cleanup into release branchLen Brown2006-07-01
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | ACPI: video: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: thermal: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: power: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: pci_root: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: pci_link: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: fan: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: button: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: battery: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: acpi_memhotplug: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: ac: Remove unneeded acpi_handle from driver.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: video: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: thermal: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: power: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: pci_root: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: pci_link: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: fan: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: button: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: battery: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: acpi_memhotplug: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: ac: Use acpi_device's handle instead of driver'sPatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: video: add struct acpi_device to struct acpi_video_bus.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use it instead of acpi_bus_get_device() in acpi_video_bus_notify() and use the one from struct acpi_video_device in acpi_video_device_notify(). Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: power: add struct acpi_device to struct acpi_power_resourcePatrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | ACPI: thermal: add struct acpi_device to struct acpi_thermal.Patrick Mochel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>