summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-28 23:32:44 +0200
committerTony Luck <tony.luck@intel.com>2005-10-28 23:32:44 +0200
commit556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09 (patch)
tree0327adc0cb1a4ae608ea293ae7d80a0948211b06 /include/asm-ia64
parentPull new-efi-memmap into release branch (diff)
parent[IA64-SGI] Remove references to the SN bist_lock (diff)
downloadlinux-556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09.tar.xz
linux-556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09.zip
Pull remove-sn-bist-lock into release branch
Diffstat (limited to 'include/asm-ia64')
-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 {
*/
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 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)
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