Pull remove-sn-bist-lock into release branch

diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index 47bb8100fd00e93a972511f7612a6999e92badfb..6f6d69e39ff59075af1637eb986ae1aefb855bc9 100644 (file)
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -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;

diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 81af4e51afa68c7da5e25da90946534016b42f44..3f7564dc0aa9bf052b6fee3a20791d4ac7ebb811 100644 (file)
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -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