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/kernel/head_64.S | |
parent | 091d0d55b286c9340201b4ed4470be87fc568228 (diff) | |
parent | abab8761d095e0805879df48a8ba6ea7f8b31c5e (diff) | |
download | op-kernel-dev-b32729b1eeae7ef8f5709923b36b5a0906d213df.zip op-kernel-dev-b32729b1eeae7ef8f5709923b36b5a0906d213df.tar.gz |
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/kernel/head_64.S')
-rw-r--r-- | arch/tile/kernel/head_64.S | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/tile/kernel/head_64.S b/arch/tile/kernel/head_64.S index f9a2734..6093964 100644 --- a/arch/tile/kernel/head_64.S +++ b/arch/tile/kernel/head_64.S @@ -34,13 +34,19 @@ ENTRY(_start) /* Notify the hypervisor of what version of the API we want */ { +#if KERNEL_PL == 1 && _HV_VERSION == 13 + /* Support older hypervisors by asking for API version 12. */ + movei r0, _HV_VERSION_OLD_HV_INIT +#else + movei r0, _HV_VERSION +#endif movei r1, TILE_CHIP - movei r2, TILE_CHIP_REV } { - moveli r0, _HV_VERSION - jal hv_init + movei r2, TILE_CHIP_REV + movei r3, KERNEL_PL } + jal hv_init /* Get a reasonable default ASID in r0 */ { move r0, zero |