diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:19 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:19 +0100 |
| commit | 9b3bf8cffaec58256681bad7682ec201fd41f3d3 (patch) | |
| tree | 11cc064b6de7023a857dcb3fd8be2b29f9c34f74 /kernel | |
| parent | cd3428916381f1b160cd062827092337e80d5a08 (diff) | |
| parent | 5d492c0fc489ac6d0a95a8ed092ec86a0b4bdd16 (diff) | |
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpress
Conflicts:
arch/arm64/kernel/debug-monitors.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/debug/debug_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index 61d1d14b762..16ff807765b 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c @@ -1047,7 +1047,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 */ |