diff options
| author | Keith Owens <kaos@sgi.com> | 2005-07-31 02:52:00 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-17 00:33:26 +0200 |
| commit | 71841b8fe7dd8caffd07482cbed4a99874bfbb70 (patch) | |
| tree | 6c8ae7c675cd99214d088c34909b5a19501f1c2c | |
| parent | Auto-update from upstream (diff) | |
| download | linux-71841b8fe7dd8caffd07482cbed4a99874bfbb70.tar.xz linux-71841b8fe7dd8caffd07482cbed4a99874bfbb70.zip | |
[IA64] Initialize some spinlocks
Some IA64 spinlocks are not being initialized, make it so.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 3 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 1 | ||||
| -rw-r--r-- | drivers/serial/sn_console.c | 1 |
3 files changed, 4 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 { static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; -static spinlock_t data_lock, data_saved_lock; +static DEFINE_SPINLOCK(data_lock); +static DEFINE_SPINLOCK(data_saved_lock); /** salinfo_platform_oemdata - optional callback to decode oemdata from an error * record. diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index a6649baf629a..37e10e010a2f 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -203,6 +203,7 @@ static void sn_fixup_ionodes(void) continue; } + spin_lock_init(&sn_flush_device_list->sfdl_flush_lock); hubdev->hdi_flush_nasid_list.widget_p[widget] = sn_flush_device_list; } diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 840815fde49b..12d1f14e78ce 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c @@ -1093,6 +1093,7 @@ int __init sn_serial_console_early_setup(void) return -1; sal_console_port.sc_ops = &poll_ops; + spin_lock_init(&sal_console_port.sc_port.lock); early_sn_setup(); /* Find SAL entry points */ register_console(&sal_console_early); |