diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 09:52:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 09:52:25 -0700 |
commit | 0660a9b16ad502874de3e793875fa23eed7b038a (patch) | |
tree | d0181e31d7dd616e16defd3b1b4fcd867e26e78f /arch/tile/kernel/smp.c | |
parent | leds-net5501: taints kernel, add license (diff) | |
parent | arch/tile: mark "hardwall" device as non-seekable (diff) | |
download | linux-dev-0660a9b16ad502874de3e793875fa23eed7b038a.tar.xz linux-dev-0660a9b16ad502874de3e793875fa23eed7b038a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: mark "hardwall" device as non-seekable
asm-generic/stat.h: support 64-bit file time_t for stat()
arch/tile: don't allow user code to set the PL via ptrace or signal return
arch/tile: correct double syscall restart for nested signals
arch/tile: avoid __must_check warning on one strict_strtol check
arch/tile: bomb raw_local_irq_ to arch_local_irq_
arch/tile: complete migration to new kmap_atomic scheme
Diffstat (limited to 'arch/tile/kernel/smp.c')
-rw-r--r-- | arch/tile/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c index 75255d90aff3..9575b37a8b75 100644 --- a/arch/tile/kernel/smp.c +++ b/arch/tile/kernel/smp.c @@ -115,7 +115,7 @@ static void smp_start_cpu_interrupt(void) static void smp_stop_cpu_interrupt(void) { set_cpu_online(smp_processor_id(), 0); - raw_local_irq_disable_all(); + arch_local_irq_disable_all(); for (;;) asm("nap"); } |