22 files changed, 96 insertions, 240 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index de1ef2fa1a20..032e6ab5d3c4 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -731,11 +731,10 @@ config ARCH_SPARSEMEM_DEFAULT
         def_bool y
         depends on SMP && PPC_PSERIES
 
-source "mm/Kconfig"
-
-config HAVE_ARCH_EARLY_PFN_TO_NID
+config ARCH_POPULATES_NODE_MAP
         def_bool y
-        depends on NEED_MULTIPLE_NODES
+
+source "mm/Kconfig"
 
 config ARCH_MEMORY_PROBE
         def_bool y
@@ -1070,7 +1069,7 @@ source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes (EXPERIMENTAL)"
-        depends on PPC64 && EXPERIMENTAL && MODULES
+        depends on PPC64 && KALLSYMS && EXPERIMENTAL && MODULES
         help
           Kprobes allows you to trap at almost any kernel address and
           execute a callback function.  register_kprobe() establishes
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index cd65c367b8b6..7b8d12b9026c 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -259,14 +259,15 @@ void kretprobe_trampoline_holder(void)
  */
 int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
-        struct kretprobe_instance *ri = NULL;
-        struct hlist_head *head;
-        struct hlist_node *node, *tmp;
+        struct kretprobe_instance *ri = NULL;
+        struct hlist_head *head, empty_rp;
+        struct hlist_node *node, *tmp;
         unsigned long flags, orig_ret_address = 0;
         unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;
 
+        INIT_HLIST_HEAD(&empty_rp);
         spin_lock_irqsave(&kretprobe_lock, flags);
-        head = kretprobe_inst_table_head(current);
+        head = kretprobe_inst_table_head(current);
 
         /*
          * It is possible to have multiple instances associated with a given
@@ -277,20 +278,20 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
          * We can handle this because:
          *     - instances are always inserted at the head of the list
          *     - when multiple return probes are registered for the same
-         *       function, the first instance's ret_addr will point to the
+         *       function, the first instance's ret_addr will point to the
          *       real return address, and all the rest will point to
          *       kretprobe_trampoline
          */
         hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
-                if (ri->task != current)
+                if (ri->task != current)
                         /* another task is sharing our hash bucket */
-                        continue;
+                        continue;
 
                 if (ri->rp && ri->rp->handler)
                         ri->rp->handler(ri, regs);
 
                 orig_ret_address = (unsigned long)ri->ret_addr;
-                recycle_rp_inst(ri);
+                recycle_rp_inst(ri, &empty_rp);
 
                 if (orig_ret_address != trampoline_address)
                         /*
@@ -308,12 +309,16 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
         spin_unlock_irqrestore(&kretprobe_lock, flags);
         preempt_enable_no_resched();
 
-        /*
-         * By returning a non-zero value, we are telling
-         * kprobe_handler() that we don't want the post_handler
-         * to run (and have re-enabled preemption)
-         */
-        return 1;
+        hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
+                hlist_del(&ri->hlist);
+                kfree(ri);
+        }
+        /*
+         * By returning a non-zero value, we are telling
+         * kprobe_handler() that we don't want the post_handler
+         * to run (and have re-enabled preemption)
+         */
+        return 1;
 }
 
 /*
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 58758d883361..88fd73fdf048 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -843,7 +843,7 @@ _GLOBAL(kernel_thread)
         addi    r1,r1,16
         blr
 
-_GLOBAL(execve)
+_GLOBAL(kernel_execve)
         li      r0,__NR_execve
         sc
         bnslr
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index e3ed21cd3d94..9c54eccad993 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -556,7 +556,7 @@ _GLOBAL(giveup_altivec)
 
 #endif /* CONFIG_ALTIVEC */
 
-_GLOBAL(execve)
+_GLOBAL(kernel_execve)
         li      r0,__NR_execve
         sc
         bnslr
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a127a1e3c097..7b2f6452ba72 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs)
         printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
                regs->nip, regs->link, regs->ctr);
         printk("REGS: %p TRAP: %04lx   %s  (%s)\n",
-               regs, regs->trap, print_tainted(), system_utsname.release);
+               regs, regs->trap, print_tainted(), init_utsname()->release);
         printk("MSR: "REG" ", regs->msr);
         printbits(regs->msr, msr_bits);
         printk("  CR: %08lX  XER: %08lX\n", regs->ccr, regs->xer);
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index e0df2ba1ab9f..79a17795d17b 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -67,10 +67,6 @@ int have_of = 1;
 dev_t boot_dev;
 #endif /* CONFIG_PPC_MULTIPLATFORM */
 
-#ifdef CONFIG_MAGIC_SYSRQ
-unsigned long SYSRQ_KEY = 0x54;
-#endif /* CONFIG_MAGIC_SYSRQ */
-
 #ifdef CONFIG_VGA_CONSOLE
 unsigned long vgacon_remap_base;
 #endif
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 00d6b8addd78..cda2dbe70a76 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -93,11 +93,6 @@ int dcache_bsize;
 int icache_bsize;
 int ucache_bsize;
 
-#ifdef CONFIG_MAGIC_SYSRQ
-unsigned long SYSRQ_KEY;
-#endif /* CONFIG_MAGIC_SYSRQ */
-
-
 #ifdef CONFIG_SMP
 
 static int smt_enabled_cmdline;
@@ -419,7 +414,7 @@ void __init setup_system(void)
         smp_release_cpus();
 #endif
 
-        printk("Starting Linux PPC64 %s\n", system_utsname.version);
+        printk("Starting Linux PPC64 %s\n", init_utsname()->version);
 
         printk("-----------------------------------------------------\n");
         printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index 7369f9a6ad25..69e8f86aa4f8 100644
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -159,8 +159,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         isync
 
         /* Load ptr the list of pages to copy in r3 */
-        lis     r11,(pagedir_nosave - KERNELBASE)@h
-        ori     r11,r11,pagedir_nosave@l
+        lis     r11,(restore_pblist - KERNELBASE)@h
+        ori     r11,r11,restore_pblist@l
         lwz     r10,0(r11)
 
         /* Copy the pages. This is a very basic implementation, to
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 2e292863e982..d15c33e95959 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -69,16 +69,20 @@ struct readdir_callback32 {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen,
-                                  off_t offset, ino_t ino, unsigned int d_type)
+                                  off_t offset, u64 ino, unsigned int d_type)
 {
         struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;
         struct old_linux_dirent32 __user * dirent;
+        ino_t d_ino;
 
         if (buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->count++;
         dirent = buf->dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(offset, &dirent->d_offset);
         put_user(namlen, &dirent->d_namlen);
         copy_to_user(dirent->d_name, name, namlen);
@@ -120,15 +124,20 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+        compat_ino_t ino;
         long err;
 
         if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
             !new_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;
         err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= __put_user(stat->ino, &statbuf->st_ino);
+        err |= __put_user(ino, &statbuf->st_ino);
         err |= __put_user(stat->mode, &statbuf->st_mode);
         err |= __put_user(stat->nlink, &statbuf->st_nlink);
         err |= __put_user(stat->uid, &statbuf->st_uid);
@@ -740,7 +749,7 @@ asmlinkage long compat_sys_umask(u32 mask)
         return sys_umask((int)mask);
 }
 
-#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_SYSCTL_SYSCALL
 struct __sysctl_args32 {
         u32 name;
         int nlen;
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 9b69d99a9103..d358866b880f 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -260,7 +260,7 @@ long ppc_newuname(struct new_utsname __user * name)
         int err = 0;
 
         down_read(&uts_sem);
-        if (copy_to_user(name, &system_utsname, sizeof(*name)))
+        if (copy_to_user(name, utsname(), sizeof(*name)))
                 err = -EFAULT;
         up_read(&uts_sem);
         if (!err)
@@ -273,7 +273,7 @@ int sys_uname(struct old_utsname __user *name)
         int err = 0;
         
         down_read(&uts_sem);
-        if (copy_to_user(name, &system_utsname, sizeof(*name)))
+        if (copy_to_user(name, utsname(), sizeof(*name)))
                 err = -EFAULT;
         up_read(&uts_sem);
         if (!err)
@@ -289,19 +289,19 @@ int sys_olduname(struct oldold_utsname __user *name)
                 return -EFAULT;
   
         down_read(&uts_sem);
-        error = __copy_to_user(&name->sysname, &system_utsname.sysname,
+        error = __copy_to_user(&name->sysname, &utsname()->sysname,
                                __OLD_UTS_LEN);
         error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
-        error |= __copy_to_user(&name->nodename, &system_utsname.nodename,
+        error |= __copy_to_user(&name->nodename, &utsname()->nodename,
                                 __OLD_UTS_LEN);
         error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
-        error |= __copy_to_user(&name->release, &system_utsname.release,
+        error |= __copy_to_user(&name->release, &utsname()->release,
                                 __OLD_UTS_LEN);
         error |= __put_user(0, name->release + __OLD_UTS_LEN);
-        error |= __copy_to_user(&name->version, &system_utsname.version,
+        error |= __copy_to_user(&name->version, &utsname()->version,
                                 __OLD_UTS_LEN);
         error |= __put_user(0, name->version + __OLD_UTS_LEN);
-        error |= __copy_to_user(&name->machine, &system_utsname.machine,
+        error |= __copy_to_user(&name->machine, &utsname()->machine,
                                 __OLD_UTS_LEN);
         error |= override_machine(name->machine);
         up_read(&uts_sem);
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index b4ed362c457a..85b9244a098c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -117,8 +117,6 @@ unsigned tb_to_ns_shift;
 
 struct gettimeofday_struct do_gtod;
 
-extern unsigned long wall_jiffies;
-
 extern struct timezone sys_tz;
 static long timezone_offset;
 
@@ -693,7 +691,7 @@ void timer_interrupt(struct pt_regs * regs)
                 tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
                 if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
                         tb_last_jiffy = tb_next_jiffy;
-                        do_timer(regs);
+                        do_timer(1);
                         timer_recalc_offset(tb_last_jiffy);
                         timer_check_rtc();
                 }
@@ -816,11 +814,6 @@ int do_settimeofday(struct timespec *tv)
         /*
          * Subtract off the number of nanoseconds since the
          * beginning of the last tick.
-         * Note that since we don't increment jiffies_64 anywhere other
-         * than in do_timer (since we don't have a lost tick problem),
-         * wall_jiffies will always be the same as jiffies,
-         * and therefore the (jiffies - wall_jiffies) computation
-         * has been removed.
          */
         tb_delta = tb_ticks_since(tb_last_jiffy);
         tb_delta = mulhdu(tb_delta, do_gtod.varp->tb_to_xs); /* in xsec */
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 78a0d59903ee..e8fa50624b70 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -333,7 +333,7 @@ good_area:
                 /* protection fault */
                 if (error_code & 0x08000000)
                         goto bad_area;
-                if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                         goto bad_area;
         }
 
@@ -386,7 +386,7 @@ bad_area_nosemaphore:
  */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        if (current->pid == 1) {
+        if (is_init(current)) {
                 yield();
                 down_read(&mm->mmap_sem);
                 goto survive;
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index eebd8b83a6b0..16fe027bbc12 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -256,20 +256,22 @@ void __init do_init_bootmem(void)
 
         boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages);
 
+        /* Add active regions with valid PFNs */
+        for (i = 0; i < lmb.memory.cnt; i++) {
+                unsigned long start_pfn, end_pfn;
+                start_pfn = lmb.memory.region[i].base >> PAGE_SHIFT;
+                end_pfn = start_pfn + lmb_size_pages(&lmb.memory, i);
+                add_active_range(0, start_pfn, end_pfn);
+        }
+
         /* Add all physical memory to the bootmem map, mark each area
          * present.
          */
-        for (i = 0; i < lmb.memory.cnt; i++) {
-                unsigned long base = lmb.memory.region[i].base;
-                unsigned long size = lmb_size_bytes(&lmb.memory, i);
 #ifdef CONFIG_HIGHMEM
-                if (base >= total_lowmem)
-                        continue;
-                if (base + size > total_lowmem)
-                        size = total_lowmem - base;
+        free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);
+#else
+        free_bootmem_with_active_regions(0, max_pfn);
 #endif
-                free_bootmem(base, size);
-        }
 
         /* reserve the sections we're already using */
         for (i = 0; i < lmb.reserved.cnt; i++)
@@ -277,9 +279,8 @@ void __init do_init_bootmem(void)
                                 lmb_size_bytes(&lmb.reserved, i));
 
         /* XXX need to clip this if using highmem? */
-        for (i = 0; i < lmb.memory.cnt; i++)
-                memory_present(0, lmb_start_pfn(&lmb.memory, i),
-                               lmb_end_pfn(&lmb.memory, i));
+        sparse_memory_present_with_active_regions(0);
+
         init_bootmem_done = 1;
 }
 
@@ -288,10 +289,9 @@ void __init do_init_bootmem(void)
  */
 void __init paging_init(void)
 {
-        unsigned long zones_size[MAX_NR_ZONES];
-        unsigned long zholes_size[MAX_NR_ZONES];
         unsigned long total_ram = lmb_phys_mem_size();
         unsigned long top_of_ram = lmb_end_of_DRAM();
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
 #ifdef CONFIG_HIGHMEM
         map_page(PKMAP_BASE, 0, 0);     /* XXX gross */
@@ -307,26 +307,13 @@ void __init paging_init(void)
                top_of_ram, total_ram);
         printk(KERN_DEBUG "Memory hole size: %ldMB\n",
                (top_of_ram - total_ram) >> 20);
-        /*
-         * All pages are DMA-able so we put them all in the DMA zone.
-         */
-        memset(zones_size, 0, sizeof(zones_size));
-        memset(zholes_size, 0, sizeof(zholes_size));
-
-        zones_size[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
-        zholes_size[ZONE_DMA] = (top_of_ram - total_ram) >> PAGE_SHIFT;
-
 #ifdef CONFIG_HIGHMEM
-        zones_size[ZONE_DMA] = total_lowmem >> PAGE_SHIFT;
-        zones_size[ZONE_HIGHMEM] = (total_memory - total_lowmem) >> PAGE_SHIFT;
-        zholes_size[ZONE_HIGHMEM] = (top_of_ram - total_ram) >> PAGE_SHIFT;
+        max_zone_pfns[0] = total_lowmem >> PAGE_SHIFT;
+        max_zone_pfns[1] = top_of_ram >> PAGE_SHIFT;
 #else
-        zones_size[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
-        zholes_size[ZONE_DMA] = (top_of_ram - total_ram) >> PAGE_SHIFT;
-#endif /* CONFIG_HIGHMEM */
-
-        free_area_init_node(0, NODE_DATA(0), zones_size,
-                            __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
+        max_zone_pfns[0] = top_of_ram >> PAGE_SHIFT;
+#endif
+        free_area_init_nodes(max_zone_pfns);
 }
 #endif /* ! CONFIG_NEED_MULTIPLE_NODES */
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 6c0f1c7d83e5..43c272075e1a 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -39,96 +39,6 @@ static bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES];
 static int min_common_depth;
 static int n_mem_addr_cells, n_mem_size_cells;
 
-/*
- * We need somewhere to store start/end/node for each region until we have
- * allocated the real node_data structures.
- */
-#define MAX_REGIONS     (MAX_LMB_REGIONS*2)
-static struct {
-        unsigned long start_pfn;
-        unsigned long end_pfn;
-        int nid;
-} init_node_data[MAX_REGIONS] __initdata;
-
-int __init early_pfn_to_nid(unsigned long pfn)
-{
-        unsigned int i;
-
-        for (i = 0; init_node_data[i].end_pfn; i++) {
-                unsigned long start_pfn = init_node_data[i].start_pfn;
-                unsigned long end_pfn = init_node_data[i].end_pfn;
-
-                if ((start_pfn <= pfn) && (pfn < end_pfn))
-                        return init_node_data[i].nid;
-        }
-
-        return -1;
-}
-
-void __init add_region(unsigned int nid, unsigned long start_pfn,
-                       unsigned long pages)
-{
-        unsigned int i;
-
-        dbg("add_region nid %d start_pfn 0x%lx pages 0x%lx\n",
-                nid, start_pfn, pages);
-
-        for (i = 0; init_node_data[i].end_pfn; i++) {
-                if (init_node_data[i].nid != nid)
-                        continue;
-                if (init_node_data[i].end_pfn == start_pfn) {
-                        init_node_data[i].end_pfn += pages;
-                        return;
-                }
-                if (init_node_data[i].start_pfn == (start_pfn + pages)) {
-                        init_node_data[i].start_pfn -= pages;
-                        return;
-                }
-        }
-
-        /*
-         * Leave last entry NULL so we dont iterate off the end (we use
-         * entry.end_pfn to terminate the walk).
-         */
-        if (i >= (MAX_REGIONS - 1)) {
-                printk(KERN_ERR "WARNING: too many memory regions in "
-                                "numa code, truncating\n");
-                return;
-        }
-
-        init_node_data[i].start_pfn = start_pfn;
-        init_node_data[i].end_pfn = start_pfn + pages;
-        init_node_data[i].nid = nid;
-}
-
-/* We assume init_node_data has no overlapping regions */
-void __init get_region(unsigned int nid, unsigned long *start_pfn,
-                       unsigned long *end_pfn, unsigned long *pages_present)
-{
-        unsigned int i;
-
-        *start_pfn = -1UL;
-        *end_pfn = *pages_present = 0;
-
-        for (i = 0; init_node_data[i].end_pfn; i++) {
-                if (init_node_data[i].nid != nid)
-                        continue;
-
-                *pages_present += init_node_data[i].end_pfn -
-                        init_node_data[i].start_pfn;
-
-                if (init_node_data[i].start_pfn < *start_pfn)
-                        *start_pfn = init_node_data[i].start_pfn;
-
-                if (init_node_data[i].end_pfn > *end_pfn)
-                        *end_pfn = init_node_data[i].end_pfn;
-        }
-
-        /* We didnt find a matching region, return start/end as 0 */
-        if (*start_pfn == -1UL)
-                *start_pfn = 0;
-}
-
 static void __cpuinit map_cpu_to_node(int cpu, int node)
 {
         numa_cpu_lookup_table[cpu] = node;
@@ -468,8 +378,8 @@ new_range:
                                 continue;
                 }
 
-                add_region(nid, start >> PAGE_SHIFT,
-                           size >> PAGE_SHIFT);
+                add_active_range(nid, start >> PAGE_SHIFT,
+                                (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT));
 
                 if (--ranges)
                         goto new_range;
@@ -482,6 +392,7 @@ static void __init setup_nonnuma(void)
 {
         unsigned long top_of_ram = lmb_end_of_DRAM();
         unsigned long total_ram = lmb_phys_mem_size();
+        unsigned long start_pfn, end_pfn;
         unsigned int i;
 
         printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
@@ -489,9 +400,11 @@ static void __init setup_nonnuma(void)
         printk(KERN_DEBUG "Memory hole size: %ldMB\n",
                (top_of_ram - total_ram) >> 20);
 
-        for (i = 0; i < lmb.memory.cnt; ++i)
-                add_region(0, lmb.memory.region[i].base >> PAGE_SHIFT,
-                           lmb_size_pages(&lmb.memory, i));
+        for (i = 0; i < lmb.memory.cnt; ++i) {
+                start_pfn = lmb.memory.region[i].base >> PAGE_SHIFT;
+                end_pfn = start_pfn + lmb_size_pages(&lmb.memory, i);
+                add_active_range(0, start_pfn, end_pfn);
+        }
         node_set_online(0);
 }
 
@@ -630,11 +543,11 @@ void __init do_init_bootmem(void)
                           (void *)(unsigned long)boot_cpuid);
 
         for_each_online_node(nid) {
-                unsigned long start_pfn, end_pfn, pages_present;
+                unsigned long start_pfn, end_pfn;
                 unsigned long bootmem_paddr;
                 unsigned long bootmap_pages;
 
-                get_region(nid, &start_pfn, &end_pfn, &pages_present);
+                get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
 
                 /* Allocate the node structure node local if possible */
                 NODE_DATA(nid) = careful_allocation(nid,
@@ -667,19 +580,7 @@ void __init do_init_bootmem(void)
                 init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,
                                   start_pfn, end_pfn);
 
-                /* Add free regions on this node */
-                for (i = 0; init_node_data[i].end_pfn; i++) {
-                        unsigned long start, end;
-
-                        if (init_node_data[i].nid != nid)
-                                continue;
-
-                        start = init_node_data[i].start_pfn << PAGE_SHIFT;
-                        end = init_node_data[i].end_pfn << PAGE_SHIFT;
-
-                        dbg("free_bootmem %lx %lx\n", start, end - start);
-                        free_bootmem_node(NODE_DATA(nid), start, end - start);
-                }
+                free_bootmem_with_active_regions(nid, end_pfn);
 
                 /* Mark reserved regions on this node */
                 for (i = 0; i < lmb.reserved.cnt; i++) {
@@ -710,44 +611,16 @@ void __init do_init_bootmem(void)
                         }
                 }
 
-                /* Add regions into sparsemem */
-                for (i = 0; init_node_data[i].end_pfn; i++) {
-                        unsigned long start, end;
-
-                        if (init_node_data[i].nid != nid)
-                                continue;
-
-                        start = init_node_data[i].start_pfn;
-                        end = init_node_data[i].end_pfn;
-
-                        memory_present(nid, start, end);
-                }
+                sparse_memory_present_with_active_regions(nid);
         }
 }
 
 void __init paging_init(void)
 {
-        unsigned long zones_size[MAX_NR_ZONES];
-        unsigned long zholes_size[MAX_NR_ZONES];
-        int nid;
-
-        memset(zones_size, 0, sizeof(zones_size));
-        memset(zholes_size, 0, sizeof(zholes_size));
-
-        for_each_online_node(nid) {
-                unsigned long start_pfn, end_pfn, pages_present;
-
-                get_region(nid, &start_pfn, &end_pfn, &pages_present);
-
-                zones_size[ZONE_DMA] = end_pfn - start_pfn;
-                zholes_size[ZONE_DMA] = zones_size[ZONE_DMA] - pages_present;
-
-                dbg("free_area_init node %d %lx %lx (hole: %lx)\n", nid,
-                    zones_size[ZONE_DMA], start_pfn, zholes_size[ZONE_DMA]);
-
-                free_area_init_node(nid, NODE_DATA(nid), zones_size, start_pfn,
-                                    zholes_size);
-        }
+        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
+                                lmb_end_of_DRAM() >> PAGE_SHIFT
+        };
+        free_area_init_nodes(max_zone_pfns);
 }
 
 static int __init early_numa(char *p)
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 7b4572805db9..3950ddccb2c8 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -82,7 +82,6 @@ spufs_new_inode(struct super_block *sb, int mode)
         inode->i_mode = mode;
         inode->i_uid = current->fsuid;
         inode->i_gid = current->fsgid;
-        inode->i_blksize = PAGE_CACHE_SIZE;
         inode->i_blocks = 0;
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 out:
@@ -120,7 +119,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry,
         ret = 0;
         inode->i_op = &spufs_file_iops;
         inode->i_fop = fops;
-        inode->u.generic_ip = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
+        inode->i_private = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
         d_add(dentry, inode);
 out:
         return ret;
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 1a2c2a50f922..1983b640bac1 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -357,7 +357,7 @@ static int dma_and_signal_ce_msg(char *ce_msg,
  */
 static int shutdown(void)
 {
-        int rc = kill_proc(1, SIGINT, 1);
+        int rc = kill_cad_pid(SIGINT, 1);
 
         if (rc) {
                 printk(KERN_ALERT "mf.c: SIGINT to init failed (%d), "
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index d30466d74194..9d22361a26d6 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -104,7 +104,7 @@ static void g5_smu_switch_volt(int speed_mode)
 {
         struct smu_simple_cmd   cmd;
 
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         smu_queue_simple(&cmd, SMU_CMD_POWER_COMMAND, 8, smu_done_complete,
                          &comp, 'V', 'S', 'L', 'E', 'W',
                          0xff, g5_fvt_cur+1, speed_mode);
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 6a36ea9bf673..692945c14919 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -195,7 +195,7 @@ static void pmu_nvram_complete(struct adb_request *req)
 static unsigned char pmu_nvram_read_byte(int addr)
 {
         struct adb_request req;
-        DECLARE_COMPLETION(req_complete); 
+        DECLARE_COMPLETION_ONSTACK(req_complete);
         
         req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL;
         if (pmu_request(&req, pmu_nvram_complete, 3, PMU_READ_NVRAM,
@@ -211,7 +211,7 @@ static unsigned char pmu_nvram_read_byte(int addr)
 static void pmu_nvram_write_byte(int addr, unsigned char val)
 {
         struct adb_request req;
-        DECLARE_COMPLETION(req_complete); 
+        DECLARE_COMPLETION_ONSTACK(req_complete);
         
         req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL;
         if (pmu_request(&req, pmu_nvram_complete, 4, PMU_WRITE_NVRAM,
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 641e6511cf06..446e17d162a5 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -85,7 +85,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file)
 
         rc = seq_open(file, &hcall_inst_seq_ops);
         seq = file->private_data;
-        seq->private = file->f_dentry->d_inode->u.generic_ip;
+        seq->private = file->f_dentry->d_inode->i_private;
 
         return rc;
 }
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 903115d67fdc..311ed1993fc0 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -337,7 +337,7 @@ static int recover_mce(struct pt_regs *regs, struct rtas_error_log * err)
                    err->disposition == RTAS_DISP_NOT_RECOVERED &&
                    err->target == RTAS_TARGET_MEMORY &&
                    err->type == RTAS_TYPE_ECC_UNCORR &&
-                   !(current->pid == 0 || current->pid == 1)) {
+                   !(current->pid == 0 || is_init(current))) {
                 /* Kill off a user process with an ECC error */
                 printk(KERN_ERR "MCE: uncorrectable ecc error for pid %d\n",
                        current->pid);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 2551da46b2a6..43dbf737698c 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -342,7 +342,7 @@ static int __init pSeries_init_panel(void)
 {
         /* Manually leave the kernel version on the panel. */
         ppc_md.progress("Linux ppc64\n", 0);
-        ppc_md.progress(system_utsname.release, 0);
+        ppc_md.progress(init_utsname()->version, 0);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index b604926401f5..723972bb5bd9 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
         for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;
              pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {
                 u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
-                if (id == PCI_CAP_ID_HT_IRQCONF) {
+                if (id == PCI_CAP_ID_HT) {
                         id = readb(devbase + pos + 3);
                         if (id == 0x80)
                                 break;