diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
| commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
| tree | 6bbc2806756924105802f4584157396fb98d282c /arch/ia64/kernel/salinfo.c | |
| parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
| parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index d227fabecd02..6f0cc7a6634e 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c | |||
| @@ -143,7 +143,8 @@ struct salinfo_data { | |||
| 143 | 143 | ||
| 144 | static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; | 144 | static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; |
| 145 | 145 | ||
| 146 | static spinlock_t data_lock, data_saved_lock; | 146 | static DEFINE_SPINLOCK(data_lock); |
| 147 | static DEFINE_SPINLOCK(data_saved_lock); | ||
| 147 | 148 | ||
| 148 | /** salinfo_platform_oemdata - optional callback to decode oemdata from an error | 149 | /** salinfo_platform_oemdata - optional callback to decode oemdata from an error |
| 149 | * record. | 150 | * record. |