summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuss Anderson <rja@efs.americas.sgi.com>2006-08-24 11:08:52 -0500
committerTony Luck <tony.luck@intel.com>2006-08-29 10:17:21 -0700
commit986e12fa74c837d7fe5bdfe80666e2e2d46711bd (patch)
treef2833ff53a75c181d28f866362acbdf6a11024b1
parenta813213d73bb29d6986c3e93669a9cd5f7984364 (diff)
downloadblackbird-op-linux-986e12fa74c837d7fe5bdfe80666e2e2d46711bd.tar.gz
blackbird-op-linux-986e12fa74c837d7fe5bdfe80666e2e2d46711bd.zip
[IA64] remove redundant local_irq_save() calls from sn_sal.h
sn_change_memprotect() does a local_irq_save() then calls ia64_sal_oemcall_nolock() which calls SAL_CALL_NOLOCK() which also does a local_irq_save(). This patch removes the redundant local_irq_save() and local_irq_restore() calls in sn_change_memprotect() and sn_inject_error(). Signed-off-by: Russ Anderson <rja@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--include/asm-ia64/sn/sn_sal.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index bd4452bda357..ba826b3f75bb 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -706,12 +706,9 @@ static inline int
sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)
{
struct ia64_sal_retval ret_stuff;
- unsigned long irq_flags;
- local_irq_save(irq_flags);
ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len,
(u64)nasid_array, perms, 0, 0, 0);
- local_irq_restore(irq_flags);
return ret_stuff.status;
}
#define SN_MEMPROT_ACCESS_CLASS_0 0x14a080
@@ -1143,12 +1140,9 @@ static inline int
sn_inject_error(u64 paddr, u64 *data, u64 *ecc)
{
struct ia64_sal_retval ret_stuff;
- unsigned long irq_flags;
- local_irq_save(irq_flags);
ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_INJECT_ERROR, paddr, (u64)data,
(u64)ecc, 0, 0, 0, 0);
- local_irq_restore(irq_flags);
return ret_stuff.status;
}
OpenPOWER on IntegriCloud