aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-28 17:32:44 -0400
committerTony Luck <tony.luck@intel.com>2005-10-28 17:32:44 -0400
commit556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09 (patch)
tree0327adc0cb1a4ae608ea293ae7d80a0948211b06
parent5833f1420b96c4f9b193b7f2fcbc0003dc032fe8 (diff)
parent36735554571ea619e38210a20f429798de90adc1 (diff)
Pull remove-sn-bist-lock into release branch
-rw-r--r--include/asm-ia64/sn/nodepda.h1
-rw-r--r--include/asm-ia64/sn/sn_sal.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index 47bb8100fd00..6f6d69e39ff5 100644
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -55,7 +55,6 @@ struct nodepda_s {
55 */ 55 */
56 struct phys_cpuid phys_cpuid[NR_CPUS]; 56 struct phys_cpuid phys_cpuid[NR_CPUS];
57 spinlock_t ptc_lock ____cacheline_aligned_in_smp; 57 spinlock_t ptc_lock ____cacheline_aligned_in_smp;
58 spinlock_t bist_lock;
59}; 58};
60 59
61typedef struct nodepda_s nodepda_t; 60typedef struct nodepda_s nodepda_t;
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 81af4e51afa6..3f7564dc0aa9 100644
--- 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)
692 unsigned long irq_flags; 692 unsigned long irq_flags;
693 693
694 cnodeid = nasid_to_cnodeid(get_node_number(paddr)); 694 cnodeid = nasid_to_cnodeid(get_node_number(paddr));
695 // spin_lock(&NODEPDA(cnodeid)->bist_lock);
696 local_irq_save(irq_flags); 695 local_irq_save(irq_flags);
697 ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len, 696 ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len,
698 (u64)nasid_array, perms, 0, 0, 0); 697 (u64)nasid_array, perms, 0, 0, 0);
699 local_irq_restore(irq_flags); 698 local_irq_restore(irq_flags);
700 // spin_unlock(&NODEPDA(cnodeid)->bist_lock);
701 return ret_stuff.status; 699 return ret_stuff.status;
702} 700}
703#define SN_MEMPROT_ACCESS_CLASS_0 0x14a080 701#define SN_MEMPROT_ACCESS_CLASS_0 0x14a080