From 25c7ff99ada8172e4e10655c0c36000b557593b4 Mon Sep 17 00:00:00 2001 From: Keith Owens Date: Sat, 30 Jul 2005 17:52:00 -0700 Subject: [PATCH] --- yaml --- r: 5845 b: refs/heads/master c: 71841b8fe7dd8caffd07482cbed4a99874bfbb70 h: refs/heads/master i: 5843: c47d00aad83b12578a36faba9640dbd83e945439 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/salinfo.c | 3 ++- trunk/arch/ia64/sn/kernel/io_init.c | 1 + trunk/drivers/serial/sn_console.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79e5f6f1c95d..008bda82c102 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7001e8f1fa5369ee24f58255726a04a2019e4bd +refs/heads/master: 71841b8fe7dd8caffd07482cbed4a99874bfbb70 diff --git a/trunk/arch/ia64/kernel/salinfo.c b/trunk/arch/ia64/kernel/salinfo.c index d227fabecd02..6f0cc7a6634e 100644 --- a/trunk/arch/ia64/kernel/salinfo.c +++ b/trunk/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/trunk/arch/ia64/sn/kernel/io_init.c b/trunk/arch/ia64/sn/kernel/io_init.c index a6649baf629a..37e10e010a2f 100644 --- a/trunk/arch/ia64/sn/kernel/io_init.c +++ b/trunk/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/trunk/drivers/serial/sn_console.c b/trunk/drivers/serial/sn_console.c index 840815fde49b..12d1f14e78ce 100644 --- a/trunk/drivers/serial/sn_console.c +++ b/trunk/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);