powerpc: Activate CONFIG_THREAD_INFO_IN_TASK

[linux-block.git] / arch / powerpc / kernel / setup-common.c

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index ca00fbb97cf898966f5f053ce8e7dc300e7c4bc9..e7534f306c8e02c389700c7c7c03c27d161cbb82 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -634,7 +634,7 @@ void probe_machine(void)
        }
        /* What can we do if we didn't find ? */
        if (machine_id >= &__machine_desc_end) {
-               DBG("No suitable machine found !\n");
+               pr_err("No suitable machine description found !\n");
                for (;;);
        }
 
@@ -791,7 +791,6 @@ void arch_setup_pdev_archdata(struct platform_device *pdev)
 {
        pdev->archdata.dma_mask = DMA_BIT_MASK(32);
        pdev->dev.dma_mask = &pdev->archdata.dma_mask;
-       set_dma_ops(&pdev->dev, &dma_nommu_ops);
 }
 
 static __init void print_system_info(void)
@@ -938,7 +937,7 @@ void __init setup_arch(char **cmdline_p)
        /* Reserve large chunks of memory for use by CMA for KVM. */
        kvm_cma_reserve();
 
-       klp_init_thread_info(&init_thread_info);
+       klp_init_thread_info(&init_task);
 
        init_mm.start_code = (unsigned long)_stext;
        init_mm.end_code = (unsigned long) _etext;