Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index e6eea0ac80c8efcf2c87e5deb5e3805c89efb9a0..fe92f70070513b2c6d91ef2a0462f0b35ccba861 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -386,7 +386,7 @@ static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
        of_node_put(memory);
 }
 
-static unsigned long __devinit read_n_cells(int n, const unsigned int **buf)
+static unsigned long read_n_cells(int n, const unsigned int **buf)
 {
        unsigned long result = 0;
 
@@ -947,7 +947,7 @@ static struct notifier_block __cpuinitdata ppc64_numa_nb = {
        .priority = 1 /* Must run before sched domains notifier. */
 };
 
-static void mark_reserved_regions_for_nid(int nid)
+static void __init mark_reserved_regions_for_nid(int nid)
 {
        struct pglist_data *node = NODE_DATA(nid);
        struct memblock_region *reg;
@@ -1440,7 +1440,7 @@ int arch_update_cpu_topology(void)
 {
        int cpu, nid, old_nid;
        unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
-       struct sys_device *sysdev;
+       struct device *dev;
 
        for_each_cpu(cpu,&cpu_associativity_changes_mask) {
                vphn_get_associativity(cpu, associativity);
@@ -1461,9 +1461,9 @@ int arch_update_cpu_topology(void)
                register_cpu_under_node(cpu, nid);
                put_online_cpus();
 
-               sysdev = get_cpu_sysdev(cpu);
-               if (sysdev)
-                       kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+               dev = get_cpu_device(cpu);
+               if (dev)
+                       kobject_uevent(&dev->kobj, KOBJ_CHANGE);
        }
 
        return 1;