|
@@ -252,9 +252,6 @@ static void cpu_ready_for_interrupts(void)
|
|
|
|
|
|
/* Set IR and DR in PACA MSR */
|
|
|
get_paca()->kernel_msr = MSR_KERNEL;
|
|
|
-
|
|
|
- /* We are now ok to enable ftrace */
|
|
|
- get_paca()->ftrace_enabled = 1;
|
|
|
}
|
|
|
|
|
|
unsigned long spr_default_dscr = 0;
|
|
@@ -349,6 +346,13 @@ void __init early_setup(unsigned long dt_ptr)
|
|
|
*/
|
|
|
cpu_ready_for_interrupts();
|
|
|
|
|
|
+ /*
|
|
|
+ * We enable ftrace here, but since we only support DYNAMIC_FTRACE, it
|
|
|
+ * will only actually get enabled on the boot cpu much later once
|
|
|
+ * ftrace itself has been initialized.
|
|
|
+ */
|
|
|
+ this_cpu_enable_ftrace();
|
|
|
+
|
|
|
DBG(" <- early_setup()\n");
|
|
|
|
|
|
#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
|