]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] remove redundant local_irq_save() calls from sn_sal.h
authorRuss Anderson <rja@efs.americas.sgi.com>
Thu, 24 Aug 2006 16:08:52 +0000 (11:08 -0500)
committerTony Luck <tony.luck@intel.com>
Tue, 29 Aug 2006 17:17:21 +0000 (10:17 -0700)
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>
include/asm-ia64/sn/sn_sal.h

index bd4452bda357b8e58837daf43093be52d147bade..ba826b3f75bbcc699aafe83769717d0495c9b7af 100644 (file)
@@ -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;
 }