From c0700cc49640da48a5fc3b74129b438413ac5b59 Mon Sep 17 00:00:00 2001 From: Xiantao Zhang Date: Thu, 31 Jan 2008 17:46:09 +0800 Subject: [PATCH] --- yaml --- r: 83321 b: refs/heads/master c: f00c2d36bf6d7efece79713930763d9a0460283e h: refs/heads/master i: 83319: 3d20ee2340f48866d692dbf30320fb7e9de615f3 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/efi.c | 1 - trunk/include/asm-ia64/processor.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 68207dec4be0..0aa10d98be64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7d57ecf4216ed29328f8e701bd65ebb66a0284c +refs/heads/master: f00c2d36bf6d7efece79713930763d9a0460283e diff --git a/trunk/arch/ia64/kernel/efi.c b/trunk/arch/ia64/kernel/efi.c index d59134d7e73c..919070a9aed7 100644 --- a/trunk/arch/ia64/kernel/efi.c +++ b/trunk/arch/ia64/kernel/efi.c @@ -421,7 +421,6 @@ efi_map_pal_code (void) pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)), IA64_GRANULE_SHIFT); ia64_set_psr(psr); /* restore psr */ - ia64_srlz_i(); } void __init diff --git a/trunk/include/asm-ia64/processor.h b/trunk/include/asm-ia64/processor.h index be3b0ae43270..038642f6d19e 100644 --- a/trunk/include/asm-ia64/processor.h +++ b/trunk/include/asm-ia64/processor.h @@ -472,7 +472,7 @@ ia64_set_psr (__u64 psr) { ia64_stop(); ia64_setreg(_IA64_REG_PSR_L, psr); - ia64_srlz_d(); + ia64_srlz_i(); } /*