aboutsummaryrefslogtreecommitdiff
path: root/kernel/debug
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2014-04-02 09:48:56 +0200
committerIngo Molnar <[email protected]>2014-04-02 09:48:56 +0200
commitb8764fe6d0ba654c8705ebbb8c2c8ddd776d8928 (patch)
tree3e28a08a044547d5429f011bcce24a3c82c89fec /kernel/debug
parentb8c89c6a0d56d47ae7f22755a133540b32fa81cf (diff)
parent683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff)
Merge branch 'linus' into x86/urgent
Pick up Linus's latest, to fix a bug. Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'kernel/debug')
-rw-r--r--kernel/debug/debug_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 334b3980ffc1..99982a70ddad 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -1035,7 +1035,7 @@ int dbg_io_get_char(void)
* otherwise as a quick means to stop program execution and "break" into
* the debugger.
*/
-void kgdb_breakpoint(void)
+noinline void kgdb_breakpoint(void)
{
atomic_inc(&kgdb_setting_breakpoint);
wmb(); /* Sync point before breakpoint */