remove queue-2.6.27/acpi-remove-locking-from-pm1x_sts-register-reads.patch

diff --git a/queue-2.6.27/acpi-remove-locking-from-pm1x_sts-register-reads.patch b/queue-2.6.27/acpi-remove-locking-from-pm1x_sts-register-reads.patch
deleted file mode 100644 (file)
index cfac601..0000000
--- a/queue-2.6.27/acpi-remove-locking-from-pm1x_sts-register-reads.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a2b7b01c072435b7832ab392167545a1b38cabc3 Mon Sep 17 00:00:00 2001
-From: Len Brown <len.brown@intel.com>
-Date: Wed, 28 Jan 2009 12:47:15 -0500
-Subject: ACPI: remove locking from PM1x_STS register reads
-
-From: Len Brown <len.brown@intel.com>
-
-commit a2b7b01c072435b7832ab392167545a1b38cabc3 upstream.
-
-PM1a_STS and PM1b_STS are twins that get OR'd together
-on reads, and all writes are repeated to both.
-
-The fields in PM1x_STS are single bits only,
-there are no multi-bit fields.
-
-So it is not necessary to lock PM1x_STS reads against
-writes because it is impossible to read an intermediate
-value of a single bit.  It will either be 0 or 1,
-even if a write is in progress during the read.
-Reads are asynchronous to writes no matter if a lock
-is used or not.
-
-Signed-off-by: Len Brown <len.brown@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/acpi/processor_idle.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/acpi/processor_idle.c
-+++ b/drivers/acpi/processor_idle.c
-@@ -447,7 +447,7 @@ static void acpi_processor_idle(void)
- 
-               pr->power.bm_activity <<= diff;
- 
--              acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-+              acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-               if (bm_status) {
-                       pr->power.bm_activity |= 0x1;
-                       acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-@@ -1383,7 +1383,7 @@ static int acpi_idle_bm_check(void)
- {
-       u32 bm_status = 0;
- 
--      acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-+      acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-       if (bm_status)
-               acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-       /*

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 11d0b40b676044a2c5165db75e50328b379d8699..d19ec44ab29046762b65a5757192948c3e4a1ade 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -23,7 +23,6 @@ ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch
 acpica-fix-table-entry-truncation-calculation.patch
 acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch
 acpi-proc_dir_entry-video-vga-already-registered.patch
-acpi-remove-locking-from-pm1x_sts-register-reads.patch
 acpi-skip-the-first-two-elements-in-the-_bcl-package.patch
 add-support-for-8-port-rs-232-mic-3620-from-advantech.patch
 alsa-hda-add-missing-coef-initialization-for-alc887.patch