Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/include/asm/memory.h

2 files changed, 14 insertions, 26 deletions

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 379cf3292390..a1f73b502ef0 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -413,7 +413,7 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
         return irq;
 }
 
-static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys)
+static int pcibios_init_resources(int busnr, struct pci_sys_data *sys)
 {
         int ret;
         struct pci_host_bridge_window *window;
@@ -445,7 +445,7 @@ static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys)
         return 0;
 }
 
-static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head)
+static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head)
 {
         struct pci_sys_data *sys = NULL;
         int ret;
@@ -464,6 +464,9 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head)
                 sys->map_irq = hw->map_irq;
                 INIT_LIST_HEAD(&sys->resources);
 
+                if (hw->private_data)
+                        sys->private_data = hw->private_data[nr];
+
                 ret = hw->setup(nr, sys);
 
                 if (ret > 0) {
@@ -493,7 +496,7 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head)
         }
 }
 
-void __init pci_common_init(struct hw_pci *hw)
+void pci_common_init(struct hw_pci *hw)
 {
         struct pci_sys_data *sys;
         LIST_HEAD(head);
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 84f4cbf652e5..365c8d92e2eb 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -125,18 +125,6 @@ void __init smp_init_cpus(void)
                 smp_ops.smp_init_cpus();
 }
 
-static void __init platform_smp_prepare_cpus(unsigned int max_cpus)
-{
-        if (smp_ops.smp_prepare_cpus)
-                smp_ops.smp_prepare_cpus(max_cpus);
-}
-
-static void __cpuinit platform_secondary_init(unsigned int cpu)
-{
-        if (smp_ops.smp_secondary_init)
-                smp_ops.smp_secondary_init(cpu);
-}
-
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
         if (smp_ops.smp_boot_secondary)
@@ -154,12 +142,6 @@ static int platform_cpu_kill(unsigned int cpu)
         return 1;
 }
 
-static void platform_cpu_die(unsigned int cpu)
-{
-        if (smp_ops.cpu_die)
-                smp_ops.cpu_die(cpu);
-}
-
 static int platform_cpu_disable(unsigned int cpu)
 {
         if (smp_ops.cpu_disable)
@@ -257,7 +239,8 @@ void __ref cpu_die(void)
          * actual CPU shutdown procedure is at least platform (if not
          * CPU) specific.
          */
-        platform_cpu_die(cpu);
+        if (smp_ops.cpu_die)
+                smp_ops.cpu_die(cpu);
 
         /*
          * Do not return to the idle loop - jump back to the secondary
@@ -324,7 +307,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
         /*
          * Give the platform a chance to do its own initialisation.
          */
-        platform_secondary_init(cpu);
+        if (smp_ops.smp_secondary_init)
+                smp_ops.smp_secondary_init(cpu);
 
         notify_cpu_starting(cpu);
 
@@ -399,8 +383,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                 /*
                  * Initialise the present map, which describes the set of CPUs
                  * actually populated at the present time. A platform should
-                 * re-initialize the map in platform_smp_prepare_cpus() if
-                 * present != possible (e.g. physical hotplug).
+                 * re-initialize the map in the platforms smp_prepare_cpus()
+                 * if present != possible (e.g. physical hotplug).
                  */
                 init_cpu_present(cpu_possible_mask);
 
@@ -408,7 +392,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                  * Initialise the SCU if there are more than one CPU
                  * and let them know where to start.
                  */
-                platform_smp_prepare_cpus(max_cpus);
+                if (smp_ops.smp_prepare_cpus)
+                        smp_ops.smp_prepare_cpus(max_cpus);
         }
 }