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

Commit 556902cd authored by Tony Luck's avatar Tony Luck
Browse files

Pull remove-sn-bist-lock into release branch

parents 5833f142 36735554

include/asm-ia64/sn/nodepda.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct nodepda_s { 
	 */

	struct phys_cpuid	phys_cpuid[NR_CPUS];

	spinlock_t		ptc_lock ____cacheline_aligned_in_smp;

	spinlock_t		bist_lock;

};



typedef struct nodepda_s nodepda_t;

include/asm-ia64/sn/sn_sal.h

+0 −2
Original line number Diff line number Diff line
@@ -692,12 +692,10 @@ sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) 
	unsigned long irq_flags;



	cnodeid = nasid_to_cnodeid(get_node_number(paddr));

	// spin_lock(&NODEPDA(cnodeid)->bist_lock);

	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);

	// spin_unlock(&NODEPDA(cnodeid)->bist_lock);

	return ret_stuff.status;

}

#define SN_MEMPROT_ACCESS_CLASS_0		0x14a080