diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
| commit | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (patch) | |
| tree | 525271129ff9c692defdd20566f1f7203b18ff24 /include/asm-ia64/sn/nodepda.h | |
| parent | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (diff) | |
| parent | 0e1f60609258e18ec0a0477c646101212822d387 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/nodepda.h')
| -rw-r--r-- | include/asm-ia64/sn/nodepda.h | 1 |
1 files changed, 0 insertions, 1 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; |