3 files changed, 14 insertions, 12 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index a3e4705dd8f0..955aae4071f7 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -169,7 +169,9 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
 }
 
 
-
+static struct acpi_dock_ops acpiphp_dock_ops = {
+        .handler = handle_hotplug_event_func,
+};
 
 /* callback routine to register each ACPI PCI slot object */
 static acpi_status
@@ -180,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);
@@ -285,7 +287,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                  */
                 newfunc->flags &= ~FUNC_HAS_EJ0;
                 if (register_hotplug_dock_device(handle,
-                        handle_hotplug_event_func, newfunc))
+                        &acpiphp_dock_ops, newfunc))
                         dbg("failed to register dock device\n");
 
                 /* we need to be notified when dock events happen
@@ -528,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;
@@ -573,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;
@@ -767,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;
@@ -808,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;
@@ -872,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;
@@ -1264,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;
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 2b7c45e39370..b291ee68b4f1 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -183,7 +183,7 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
         union acpi_object args[2]; 
         struct acpi_object_list params = { .pointer = args, .count = 2 };
         acpi_status stat; 
-        unsigned long rc;
+        unsigned long long rc;
         union apci_descriptor *ibm_slot;
 
         ibm_slot = ibm_slot_from_id(hpslot_to_sun(slot));
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 410fe0394a8e..59f42501acce 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -418,7 +418,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         /*
          * Add the slot's devices to the ACPI infrastructure */
         if (SN_ACPI_BASE_SUPPORT() && ssdt) {
-                unsigned long adr;
+                unsigned long long adr;
                 struct acpi_device *pdevice;
                 struct acpi_device *device;
                 acpi_handle phandle;
@@ -510,7 +510,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
         /* free the ACPI resources for the slot */
         if (SN_ACPI_BASE_SUPPORT() &&
             PCI_CONTROLLER(slot->pci_bus)->acpi_handle) {
-                unsigned long adr;
+                unsigned long long adr;
                 struct acpi_device *device;
                 acpi_handle phandle;
                 acpi_handle chandle = NULL;