Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / arch / x86 / kernel / entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 2cfbc3a3a2dd61055bccc6633a80a5910c293529..f0dcb0ceb6a2eda24d298b8a05650374e753bcf6 100644 (file)
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1176,6 +1176,9 @@ ftrace_restore_flags:
 #else /* ! CONFIG_DYNAMIC_FTRACE */
 
 ENTRY(mcount)
+       cmpl $__PAGE_OFFSET, %esp
+       jb ftrace_stub          /* Paging not enabled yet? */
+
        cmpl $0, function_trace_stop
        jne  ftrace_stub