diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
| commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
| tree | 0816c565d26ae24854616faa0d497be365c2fe8b /arch/alpha/kernel/core_t2.c | |
| parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/alpha/kernel/core_t2.c')
| -rw-r--r-- | arch/alpha/kernel/core_t2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index c0750291b44a..d9980d47ab81 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c | |||
| @@ -74,6 +74,8 @@ | |||
| 74 | # define DBG(args) | 74 | # define DBG(args) |
| 75 | #endif | 75 | #endif |
| 76 | 76 | ||
| 77 | DEFINE_SPINLOCK(t2_hae_lock); | ||
| 78 | |||
| 77 | static volatile unsigned int t2_mcheck_any_expected; | 79 | static volatile unsigned int t2_mcheck_any_expected; |
| 78 | static volatile unsigned int t2_mcheck_last_taken; | 80 | static volatile unsigned int t2_mcheck_last_taken; |
| 79 | 81 | ||