diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 14:34:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 14:34:58 -0700 |
| commit | b32729b1eeae7ef8f5709923b36b5a0906d213df (patch) | |
| tree | 20bb9092d2c67569ea4efd95c0df5b8160b8b1a3 /arch/tile/lib | |
| parent | 091d0d55b286c9340201b4ed4470be87fc568228 (diff) | |
| parent | abab8761d095e0805879df48a8ba6ea7f8b31c5e (diff) | |
| download | blackbird-obmc-linux-b32729b1eeae7ef8f5709923b36b5a0906d213df.tar.gz blackbird-obmc-linux-b32729b1eeae7ef8f5709923b36b5a0906d213df.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile update from Chris Metcalf:
"The interesting bug fix is support for the upcoming "4.2" release of
the Tilera hypervisor, which by default launches Linux at privilege
level 2 instead of 1. The fix lets new and old hypervisors and
Linuxes interoperate more smoothly, so I've tagged it for
stable@kernel.org so that older Linuxes will be able to boot under the
newer hypervisor."
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
usb: tilegx: fix memleak when create hcd fail
arch/tile: remove inline marking of EXPORT_SYMBOL functions
rtc: rtc-tile: add missing platform_device_unregister() when module exit
tile: support new Tilera hypervisor
Diffstat (limited to 'arch/tile/lib')
| -rw-r--r-- | arch/tile/lib/spinlock_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/lib/spinlock_32.c b/arch/tile/lib/spinlock_32.c index b16ac49a968e..b34f79aada48 100644 --- a/arch/tile/lib/spinlock_32.c +++ b/arch/tile/lib/spinlock_32.c @@ -101,7 +101,7 @@ EXPORT_SYMBOL(arch_spin_unlock_wait); * preserve the semantic that the same read lock can be acquired in an * interrupt context. */ -inline int arch_read_trylock(arch_rwlock_t *rwlock) +int arch_read_trylock(arch_rwlock_t *rwlock) { u32 val; __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 1); |
