Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986e12fa authored by Russ Anderson's avatar Russ Anderson Committed by Tony Luck
Browse files

[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: default avatarRuss Anderson <rja@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a813213d

include/asm-ia64/sn/sn_sal.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -706,12 +706,9 @@ static inline int 
sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)

sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)

{

{

	struct ia64_sal_retval ret_stuff;

	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,

	ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len,

				(u64)nasid_array, perms, 0, 0, 0);

				(u64)nasid_array, perms, 0, 0, 0);

	local_irq_restore(irq_flags);

	return ret_stuff.status;

	return ret_stuff.status;

}

}

#define SN_MEMPROT_ACCESS_CLASS_0		0x14a080

#define SN_MEMPROT_ACCESS_CLASS_0		0x14a080
@@ -1143,12 +1140,9 @@ static inline int 
sn_inject_error(u64 paddr, u64 *data, u64 *ecc)

sn_inject_error(u64 paddr, u64 *data, u64 *ecc)

{

{

	struct ia64_sal_retval ret_stuff;

	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,

	ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_INJECT_ERROR, paddr, (u64)data,

				(u64)ecc, 0, 0, 0, 0);

				(u64)ecc, 0, 0, 0, 0);

	local_irq_restore(irq_flags);

	return ret_stuff.status;

	return ret_stuff.status;

}

}