diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:13:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:13:20 +0100 |
| commit | fb64c4d995f8ed48e1b3ba95f64c6c52c199cd41 (patch) | |
| tree | 93b09942e9327d065db1b7d70aaf4900cbd03a95 /arch/arm64/kernel/smp.c | |
| parent | 2a9c8004701ab3f31758bf919d6f1fa027bbe280 (diff) | |
| parent | a99a4e55f652f72dc736935a795936b65c47a17f (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/debug-monitors.c
arch/arm64/mm/dma-mapping.c
Diffstat (limited to 'arch/arm64/kernel/smp.c')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 6b0001216189..f18fb802b790 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -173,6 +173,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) local_irq_enable(); local_fiq_enable(); + local_dbg_enable(); local_irq_enable(); local_fiq_enable(); |