Skip to content

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

Pull remove-sn-bist-lock into release branch

parents 5833f142 36735554
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
include/asm-ia64/sn/nodepda.h
View file @ 556902cd
...@@ -55,7 +55,6 @@ struct nodepda_s { ...@@ -55,7 +55,6 @@ struct nodepda_s {
*/ */
struct phys_cpuid phys_cpuid[NR_CPUS]; struct phys_cpuid phys_cpuid[NR_CPUS];
spinlock_t ptc_lock ____cacheline_aligned_in_smp; spinlock_t ptc_lock ____cacheline_aligned_in_smp;
spinlock_t bist_lock;
}; };
typedef struct nodepda_s nodepda_t; typedef struct nodepda_s nodepda_t;
......
include/asm-ia64/sn/sn_sal.h
View file @ 556902cd
...@@ -692,12 +692,10 @@ sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) ...@@ -692,12 +692,10 @@ sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)
unsigned long irq_flags; unsigned long irq_flags;
cnodeid = nasid_to_cnodeid(get_node_number(paddr)); cnodeid = nasid_to_cnodeid(get_node_number(paddr));
// spin_lock(&NODEPDA(cnodeid)->bist_lock);
local_irq_save(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); local_irq_restore(irq_flags);
// spin_unlock(&NODEPDA(cnodeid)->bist_lock);
return ret_stuff.status; return ret_stuff.status;
} }
#define SN_MEMPROT_ACCESS_CLASS_0 0x14a080 #define SN_MEMPROT_ACCESS_CLASS_0 0x14a080
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7