diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 19:43:25 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 19:43:25 +0400 |
| commit | 506bdac95b1728dc5dad1ca744e7db4ee6145e2b (patch) | |
| tree | 7f57b7f75d67e985a9974581cecad92d22812238 /arch/tile/kernel/head_64.S | |
| parent | f1e9e3175bc540979fb06d937fb6bc7348f7536f (diff) | |
| parent | 0bfd8ffeff9dda08c69381d65c72e0aa58706ef6 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-linux-linaro-lsk
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 f9a2734f7b8..6093964fa5c 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 |