2 files changed, 10 insertions, 2 deletions

diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index 12158e0d009b..da9d6d25cf6d 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -57,7 +57,7 @@ ACPI_MODULE_NAME("pci_slot");
                                 MY_NAME , ## arg);              \
         } while (0)
 
-#define SLOT_NAME_SIZE 20               /* Inspired by #define in acpiphp.h */
+#define SLOT_NAME_SIZE 21               /* Inspired by #define in acpiphp.h */
 
 struct acpi_pci_slot {
         acpi_handle root_handle;        /* handle of the root bridge */
@@ -149,7 +149,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                 return AE_OK;
         }
 
-        snprintf(name, sizeof(name), "%u", (u32)sun);
+        snprintf(name, sizeof(name), "%llu", sun);
         pci_slot = pci_create_slot(pci_bus, device, name, NULL);
         if (IS_ERR(pci_slot)) {
                 err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 42159a28f433..e0a74097a978 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -405,6 +405,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 },
         },
         {
+        .callback = init_set_sci_en_on_resume,
+        .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
+                },
+        },
+        {
         .callback = init_old_suspend_ordering,
         .ident = "Panasonic CF51-2L",
         .matches = {