Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h

1 files changed, 36 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 573afb68d69e..bc3e15be3087 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -223,6 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         struct vm_area_struct *vma;
         unsigned long vdso_pages;
         unsigned long vdso_base;
+        int rc;
 
 #ifdef CONFIG_PPC64
         if (test_thread_flag(TIF_32BIT)) {
@@ -237,20 +238,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         vdso_base = VDSO32_MBASE;
 #endif
 
-        current->thread.vdso_base = 0;
+        current->mm->context.vdso_base = 0;
 
         /* vDSO has a problem and was disabled, just don't "enable" it for the
          * process
          */
         if (vdso_pages == 0)
                 return 0;
-
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
-        if (vma == NULL)
-                return -ENOMEM;
-
-        memset(vma, 0, sizeof(*vma));
-
         /* Add a page to the vdso size for the data page */
         vdso_pages ++;
 
@@ -259,17 +253,23 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
          * at vdso_base which is the "natural" base for it, but we might fail
          * and end up putting it elsewhere.
          */
+        down_write(&mm->mmap_sem);
         vdso_base = get_unmapped_area(NULL, vdso_base,
                                       vdso_pages << PAGE_SHIFT, 0, 0);
-        if (vdso_base & ~PAGE_MASK) {
-                kmem_cache_free(vm_area_cachep, vma);
-                return (int)vdso_base;
+        if (IS_ERR_VALUE(vdso_base)) {
+                rc = vdso_base;
+                goto fail_mmapsem;
         }
 
-        current->thread.vdso_base = vdso_base;
 
+        /* Allocate a VMA structure and fill it up */
+        vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+        if (vma == NULL) {
+                rc = -ENOMEM;
+                goto fail_mmapsem;
+        }
         vma->vm_mm = mm;
-        vma->vm_start = current->thread.vdso_base;
+        vma->vm_start = vdso_base;
         vma->vm_end = vma->vm_start + (vdso_pages << PAGE_SHIFT);
 
         /*
@@ -282,23 +282,38 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
          * It's fine to use that for setting breakpoints in the vDSO code
          * pages though
          */
-        vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
+        vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;
         vma->vm_flags |= mm->def_flags;
         vma->vm_page_prot = protection_map[vma->vm_flags & 0x7];
         vma->vm_ops = &vdso_vmops;
 
-        down_write(&mm->mmap_sem);
-        if (insert_vm_struct(mm, vma)) {
-                up_write(&mm->mmap_sem);
-                kmem_cache_free(vm_area_cachep, vma);
-                return -ENOMEM;
-        }
+        /* Insert new VMA */
+        rc = insert_vm_struct(mm, vma);
+        if (rc)
+                goto fail_vma;
+
+        /* Put vDSO base into mm struct and account for memory usage */
+        current->mm->context.vdso_base = vdso_base;
         mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
         up_write(&mm->mmap_sem);
-
         return 0;
+
+ fail_vma:
+        kmem_cache_free(vm_area_cachep, vma);
+ fail_mmapsem:
+        up_write(&mm->mmap_sem);
+        return rc;
+}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+        if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso_base)
+                return "[vdso]";
+        return NULL;
 }
 
+
+
 static void * __init find_section32(Elf32_Ehdr *ehdr, const char *secname,
                                   unsigned long *size)
 {