Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index db54c5ef2aa5..955aae4071f7 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -182,7 +182,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         struct acpiphp_func *newfunc;
         acpi_handle tmp;
         acpi_status status = AE_OK;
-        unsigned long adr, sun;
+        unsigned long long adr, sun;
         int device, function, retval;
 
         status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
@@ -530,7 +530,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         acpi_status status;
         acpi_handle dummy_handle;
-        unsigned long tmp;
+        unsigned long long tmp;
         int device, function;
         struct pci_dev *dev;
         struct pci_bus *pci_bus = context;
@@ -575,7 +575,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
 static int add_bridge(acpi_handle handle)
 {
         acpi_status status;
-        unsigned long tmp;
+        unsigned long long tmp;
         int seg, bus;
         acpi_handle dummy_handle;
         struct pci_bus *pci_bus;
@@ -769,7 +769,7 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base)
 {
         acpi_status status;
         int result = -1;
-        unsigned long gsb;
+        unsigned long long gsb;
         struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
         union acpi_object *obj;
         void *table;
@@ -810,7 +810,7 @@ static acpi_status
 ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         acpi_status status;
-        unsigned long sta;
+        unsigned long long sta;
         acpi_handle tmp;
         struct pci_dev *pdev;
         u32 gsi_base;
@@ -874,7 +874,7 @@ static acpi_status
 ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         acpi_status status;
-        unsigned long sta;
+        unsigned long long sta;
         acpi_handle tmp;
         u32 gsi_base;
         struct acpiphp_ioapic *pos, *n, *ioapic = NULL;
@@ -1266,7 +1266,7 @@ static int disable_device(struct acpiphp_slot *slot)
 static unsigned int get_slot_status(struct acpiphp_slot *slot)
 {
         acpi_status status;
-        unsigned long sta = 0;
+        unsigned long long sta = 0;
         u32 dvid;
         struct list_head *l;
         struct acpiphp_func *func;