From 36d71c6413b75615af996c76200c93eb6b2f9b11 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Sat, 5 Sep 2009 13:38:34 -0400
Subject: [PATCH] --- yaml --- r: 165167 b: refs/heads/master c:
 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 h: refs/heads/master i:   165165:
 5a5996c8d23b094302871a6fc2323d043ddefbac   165163:
 4e1473f184ce9fb9c5e6ebf9db2a9d627091ab9e   165159:
 278f06301a49f2f7b353aabbb4fdc8547afe575c   165151:
 08ecc8e9c2497c9654492ce27ae9d40f9fe4fd9d v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/pci_slot.c | 4 ++--
 trunk/drivers/acpi/sleep.c    | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d2a59647c719..8f1fbef10211 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f61f925859c57f6175082aeeee17743c68558a6e
+refs/heads/master: 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8
diff --git a/trunk/drivers/acpi/pci_slot.c b/trunk/drivers/acpi/pci_slot.c
index 12158e0d009b..da9d6d25cf6d 100644
--- a/trunk/drivers/acpi/pci_slot.c
+++ b/trunk/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/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c
index 42159a28f433..e0a74097a978 100644
--- a/trunk/drivers/acpi/sleep.c
+++ b/trunk/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 = {