diff options
| -rw-r--r-- | include/asm-ia64/sn/nodepda.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/sn/sn_sal.h | 2 |
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 | ||
| 61 | typedef struct nodepda_s nodepda_t; | 60 | 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 fea35b33d4e4..33aa4043f87d 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h | |||
| @@ -694,12 +694,10 @@ sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) | |||
| 694 | unsigned long irq_flags; | 694 | unsigned long irq_flags; |
| 695 | 695 | ||
| 696 | cnodeid = nasid_to_cnodeid(get_node_number(paddr)); | 696 | cnodeid = nasid_to_cnodeid(get_node_number(paddr)); |
| 697 | // spin_lock(&NODEPDA(cnodeid)->bist_lock); | ||
| 698 | local_irq_save(irq_flags); | 697 | local_irq_save(irq_flags); |
| 699 | ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len, | 698 | ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_MEMPROTECT, paddr, len, |
| 700 | (u64)nasid_array, perms, 0, 0, 0); | 699 | (u64)nasid_array, perms, 0, 0, 0); |
| 701 | local_irq_restore(irq_flags); | 700 | local_irq_restore(irq_flags); |
| 702 | // spin_unlock(&NODEPDA(cnodeid)->bist_lock); | ||
| 703 | return ret_stuff.status; | 701 | return ret_stuff.status; |
| 704 | } | 702 | } |
| 705 | #define SN_MEMPROT_ACCESS_CLASS_0 0x14a080 | 703 | #define SN_MEMPROT_ACCESS_CLASS_0 0x14a080 |
