Merge remote-tracking branch 'linus/master' into testing

4 files changed, 29 insertions, 21 deletions

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index bcda5b2d121a..d43daf192b21 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2042,7 +2042,8 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
 #endif
 
 static int __init
-acpi_sba_ioc_add(struct acpi_device *device)
+acpi_sba_ioc_add(struct acpi_device *device,
+                 const struct acpi_device_id *not_used)
 {
         struct ioc *ioc;
         acpi_status status;
@@ -2090,14 +2091,18 @@ static const struct acpi_device_id hp_ioc_iommu_device_ids[] = {
         {"HWP0004", 0},
         {"", 0},
 };
-static struct acpi_driver acpi_sba_ioc_driver = {
-        .name           = "IOC IOMMU Driver",
-        .ids            = hp_ioc_iommu_device_ids,
-        .ops            = {
-                .add    = acpi_sba_ioc_add,
-        },
+static struct acpi_scan_handler acpi_sba_ioc_handler = {
+        .ids    = hp_ioc_iommu_device_ids,
+        .attach = acpi_sba_ioc_add,
 };
 
+static int __init acpi_sba_ioc_init_acpi(void)
+{
+        return acpi_scan_add_handler(&acpi_sba_ioc_handler);
+}
+/* This has to run before acpi_scan_init(). */
+arch_initcall(acpi_sba_ioc_init_acpi);
+
 extern struct dma_map_ops swiotlb_dma_ops;
 
 static int __init
@@ -2122,7 +2127,10 @@ sba_init(void)
         }
 #endif
 
-        acpi_bus_register_driver(&acpi_sba_ioc_driver);
+        /*
+         * ioc_list should be populated by the acpi_sba_ioc_handler's .attach()
+         * routine, but that only happens if acpi_scan_init() has already run.
+         */
         if (!ioc_list) {
 #ifdef CONFIG_IA64_GENERIC
                 /*
diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c
index 271f412bda1a..87bf9ad8cf0f 100644
--- a/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/arch/ia64/hp/sim/boot/fw-emu.c
@@ -290,16 +290,16 @@ sys_fw_init (const char *args, int arglen)
         efi_runtime->hdr.signature = EFI_RUNTIME_SERVICES_SIGNATURE;
         efi_runtime->hdr.revision = EFI_RUNTIME_SERVICES_REVISION;
         efi_runtime->hdr.headersize = sizeof(efi_runtime->hdr);
-        efi_runtime->get_time = __pa(&fw_efi_get_time);
-        efi_runtime->set_time = __pa(&efi_unimplemented);
-        efi_runtime->get_wakeup_time = __pa(&efi_unimplemented);
-        efi_runtime->set_wakeup_time = __pa(&efi_unimplemented);
-        efi_runtime->set_virtual_address_map = __pa(&efi_unimplemented);
-        efi_runtime->get_variable = __pa(&efi_unimplemented);
-        efi_runtime->get_next_variable = __pa(&efi_unimplemented);
-        efi_runtime->set_variable = __pa(&efi_unimplemented);
-        efi_runtime->get_next_high_mono_count = __pa(&efi_unimplemented);
-        efi_runtime->reset_system = __pa(&efi_reset_system);
+        efi_runtime->get_time = (void *)__pa(&fw_efi_get_time);
+        efi_runtime->set_time = (void *)__pa(&efi_unimplemented);
+        efi_runtime->get_wakeup_time = (void *)__pa(&efi_unimplemented);
+        efi_runtime->set_wakeup_time = (void *)__pa(&efi_unimplemented);
+        efi_runtime->set_virtual_address_map = (void *)__pa(&efi_unimplemented);
+        efi_runtime->get_variable = (void *)__pa(&efi_unimplemented);
+        efi_runtime->get_next_variable = (void *)__pa(&efi_unimplemented);
+        efi_runtime->set_variable = (void *)__pa(&efi_unimplemented);
+        efi_runtime->get_next_high_mono_count = (void *)__pa(&efi_unimplemented);
+        efi_runtime->reset_system = (void *)__pa(&efi_reset_system);
 
         efi_tables->guid = SAL_SYSTEM_TABLE_GUID;
         efi_tables->table = __pa(sal_systab);
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index c13064e422df..d1b04c4c95e3 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -268,7 +268,7 @@ static __inline__ int dev_is_ethdev(struct net_device *dev)
 static int
 simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
 {
-        struct net_device *dev = ptr;
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
         struct simeth_local *local;
         struct in_device *in_dev;
         struct in_ifaddr **ifap = NULL;
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 331de723c676..3a428f19a001 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -88,8 +88,8 @@ simscsi_setup (char *s)
         if (strlen(s) > MAX_ROOT_LEN) {
                 printk(KERN_ERR "simscsi_setup: prefix too long---using default %s\n",
                        simscsi_root);
-        }
-        simscsi_root = s;
+        } else
+                simscsi_root = s;
         return 1;
 }