diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-22 20:33:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-22 20:33:38 -0700 |
| commit | efdfce2b7ff3205ba0fba10270b92b80bbc6187d (patch) | |
| tree | 6275099128c1e228b79dc0923ae936c24ea5a36f /arch/ia64/kernel/efi.c | |
| parent | df68770983b7010ab01e68a21ef67fc034715701 (diff) | |
| parent | e55645ec5725a33eac9d6133f3bce381af1e993d (diff) | |
| download | linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.tar.gz linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.tar.bz2 linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.zip | |
Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 paravirt removal from Tony Luck:
"Nobody cares about paravirtualization on ia64 anymore"
* tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: remove paravirt code
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index c52d7540dc05..47e962f7ed5a 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -464,7 +464,6 @@ efi_map_pal_code (void) GRANULEROUNDDOWN((unsigned long) pal_vaddr), pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)), IA64_GRANULE_SHIFT); - paravirt_dv_serialize_data(); ia64_set_psr(psr); /* restore psr */ } |