3 files changed, 7 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 3a8d8d2eee92..9684cc827930 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -445,7 +445,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 
         /* Differentiate between RSDT and XSDT root tables */
 
-        if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {
+        if (rsdp->revision > 1 && rsdp->xsdt_physical_address
+                        && !acpi_rsdt_forced) {
                 /*
                  * Root table is an XSDT (64-bit physical addresses). We must use the
                  * XSDT if the revision is > 1 and the XSDT pointer is present, as per
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 4869fa1b7892..1c6e73c7865e 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -796,10 +796,6 @@ static int irqrouter_resume(struct sys_device *dev)
         struct list_head *node = NULL;
         struct acpi_pci_link *link = NULL;
 
-
-        /* Make sure SCI is enabled again (Apple firmware bug?) */
-        acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
-
         list_for_each(node, &acpi_link.entries) {
                 link = list_entry(node, struct acpi_pci_link, node);
                 if (!link) {
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 38bf8b43fd19..f261737636da 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -482,6 +482,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
         int status = AE_OK;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
+        int state;
 
 
         arg0.integer.value = level;
@@ -490,6 +491,10 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
                 status = acpi_evaluate_object(device->dev->handle, "_BCM",
                                               &args, NULL);
         device->brightness->curr = level;
+        for (state = 2; state < device->brightness->count; state++)
+                if (level == device->brightness->levels[state])
+                        device->backlight->props.brightness = state - 2;
+
         return status;
 }