[PATCH][02] Change srlz.d to srlz.i for ia64_set_psr

Zhang, Xiantao
2008-01-31T10:28:19Z

[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]

From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 31 Jan 2008 17:46:09 +0800
Subject: [PATCH] IA64: ia64_set_psr may need srlz.i sometimes.

Once psr.ic changes by ia64_set_psr, srlz.i is needed here.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
arch/ia64/kernel/efi.c | 1 -
include/asm-ia64/processor.h | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 242d793..f3823db 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -405,7 +405,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/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index be3b0ae..038642f 100644
--- a/include/asm-ia64/processor.h
+++ b/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();
}

/*
--
1.5.1

[-- Attachment #2: 0002-IA64-ia64_set_psr-may-need-srlz.i-sometimes.patch --]
[-- Type: application/octet-stream, Size: 1154 bytes --]

From 51decd8eb030e4fdf15c14ebe52bbb708a52c43d Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 31 Jan 2008 17:46:09 +0800
Subject: [PATCH] IA64: ia64_set_psr may need srlz.i sometimes.

Once psr.ic changes by ia64_set_psr, srlz.i is needed here.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
arch/ia64/kernel/efi.c | 1 -
include/asm-ia64/processor.h | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 242d793..f3823db 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -405,7 +405,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/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index be3b0ae..038642f 100644
--- a/include/asm-ia64/processor.h
+++ b/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();
}

/*
--
1.5.1