Merge branch 'linux-2.6' into merge

32 files changed, 171 insertions, 245 deletions

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 590f1f67c874..a83dfa3cf40c 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -351,9 +351,14 @@ static void __init htab_init_page_sizes(void)
                 mmu_vmalloc_psize = MMU_PAGE_64K;
                 if (mmu_linear_psize == MMU_PAGE_4K)
                         mmu_linear_psize = MMU_PAGE_64K;
-                if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE))
-                        mmu_io_psize = MMU_PAGE_64K;
-                else
+                if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE)) {
+                        /*
+                         * Don't use 64k pages for ioremap on pSeries, since
+                         * that would stop us accessing the HEA ethernet.
+                         */
+                        if (!machine_is(pseries))
+                                mmu_io_psize = MMU_PAGE_64K;
+                } else
                         mmu_ci_restrictions = 1;
         }
 #endif /* CONFIG_PPC_64K_PAGES */
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index f589999361e0..64ec7d629363 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -52,6 +52,10 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size)
         int i, tasknum = -1;
         struct bcom_task *tsk;
 
+        /* Don't try to do anything if bestcomm init failed */
+        if (!bcom_eng)
+                return NULL;
+
         /* Get and reserve a task num */
         spin_lock(&bcom_eng->lock);
 
@@ -484,8 +488,8 @@ mpc52xx_bcom_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_bcom_of_match[] = {
-        { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
-        { .type = "dma-controller", .compatible = "mpc5200-bestcomm", },
+        { .compatible = "fsl,mpc5200-bestcomm", },
+        { .compatible = "mpc5200-bestcomm", },
         {},
 };
 
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index ae0dbf4c1d66..0f2dfb0aaa6a 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -906,7 +906,7 @@ static int __init init_ipic_sysfs(void)
 {
         int rc;
 
-        if (!primary_ipic->regs)
+        if (!primary_ipic || !primary_ipic->regs)
                 return -ENODEV;
         printk(KERN_DEBUG "Registering ipic with sysfs...\n");
 
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
index bd76482077be..edb74f5a1186 100644
--- a/arch/sparc64/kernel/ds.c
+++ b/arch/sparc64/kernel/ds.c
@@ -972,8 +972,7 @@ static void process_ds_work(void)
         LIST_HEAD(todo);
 
         spin_lock_irqsave(&ds_lock, flags);
-        list_splice(&ds_work_list, &todo);
-        INIT_LIST_HEAD(&ds_work_list);
+        list_splice_init(&ds_work_list, &todo);
         spin_unlock_irqrestore(&ds_lock, flags);
 
         list_for_each_entry_safe(qp, tmp, &todo, list) {
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 44b105c04dd3..34f8ff57c56b 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -288,8 +288,12 @@ sun4v_chip_type:
         /* Leave arg2 as-is, prom_mmu_ihandle_cache */
         mov     -1, %l3
         stx     %l3, [%sp + 2047 + 128 + 0x28]  ! arg3: mode (-1 default)
-        sethi   %hi(8 * 1024 * 1024), %l3
-        stx     %l3, [%sp + 2047 + 128 + 0x30]  ! arg4: size (8MB)
+        /* 4MB align the kernel image size. */
+        set     (_end - KERNBASE), %l3
+        set     ((4 * 1024 * 1024) - 1), %l4
+        add     %l3, %l4, %l3
+        andn    %l3, %l4, %l3
+        stx     %l3, [%sp + 2047 + 128 + 0x30]  ! arg4: roundup(ksize, 4MB)
         sethi   %hi(KERNBASE), %l3
         stx     %l3, [%sp + 2047 + 128 + 0x38]  ! arg5: vaddr (KERNBASE)
         stx     %g0, [%sp + 2047 + 128 + 0x40]  ! arg6: empty
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index e116e38b160e..acf8c5250aa9 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -731,9 +731,6 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
                 current_thread_info()->xfsr[0] = 0;
                 current_thread_info()->fpsaved[0] = 0;
                 regs->tstate &= ~TSTATE_PEF;
-                task_lock(current);
-                current->ptrace &= ~PT_DTRACE;
-                task_unlock(current);
         }
 out:
         return error;
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index cc454731d879..5a1126b363a4 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -284,14 +284,17 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
 {
         extern unsigned long sparc64_ttable_tl0;
         extern unsigned long kern_locked_tte_data;
-        extern int bigkernel;
         struct hvtramp_descr *hdesc;
         unsigned long trampoline_ra;
         struct trap_per_cpu *tb;
         u64 tte_vaddr, tte_data;
         unsigned long hv_err;
+        int i;
 
-        hdesc = kzalloc(sizeof(*hdesc), GFP_KERNEL);
+        hdesc = kzalloc(sizeof(*hdesc) +
+                        (sizeof(struct hvtramp_mapping) *
+                         num_kernel_image_mappings - 1),
+                        GFP_KERNEL);
         if (!hdesc) {
                 printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate "
                        "hvtramp_descr.\n");
@@ -299,7 +302,7 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
         }