diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-12 07:12:53 +0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-12 07:12:53 +0800 |
commit | 2a1497c3c4e884d6886e13741d0ba1abd2631006 (patch) | |
tree | bd46dba64fba48adfec403dff75682b9ba4e2774 /arch/blackfin/Kconfig | |
parent | 1a95620f45155ac523cd1419d89150fbb4eb858b (diff) | |
parent | 6895f97e15895625e03c95df904d92befdac7118 (diff) | |
download | op-kernel-dev-2a1497c3c4e884d6886e13741d0ba1abd2631006.zip op-kernel-dev-2a1497c3c4e884d6886e13741d0ba1abd2631006.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin updates from Bob Liu:
"One kbuild and a smp build fix."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
kbuild: add symbol prefix arg to kallsyms
blackfin: smp: adapt to generic smp helpers
Diffstat (limited to 'arch/blackfin/Kconfig')
-rw-r--r-- | arch/blackfin/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f348619..c7092e6 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -38,6 +38,7 @@ config BLACKFIN select GENERIC_ATOMIC64 select GENERIC_IRQ_PROBE select IRQ_PER_CPU if SMP + select USE_GENERIC_SMP_HELPERS if SMP select HAVE_NMI_WATCHDOG if NMI_WATCHDOG select GENERIC_SMP_IDLE_THREAD select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS |