diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/ia64/kernel/efi.c | |
| parent | sh: ap325 and Migo-R use new sh_mobile_ceu_info flags (diff) | |
| parent | serial: fixup /proc/tty/driver/serial after proc_fops conversion (diff) | |
| download | linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.xz linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index efaff15d8cf1..7ef80e8161ce 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -456,6 +456,7 @@ 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 */ } |