Skip to contentSkip to conversation

SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64

PATCH New Milind Arun Choudhary 1 participant 1 message Apr 15, 2007 Kernel janitors

lore
Share & tools
lore

Milind Arun Choudhary

author
#0 lore raw

PATCH 1/1 SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64

SPIN_LOCK_UNLOCKED macro cleanup, use __SPIN_LOCK_UNLOCKED instead.

Signed-off-by Milind Arun Choudhary <[email protected]>
---
 kernel/traps.c  |    6 +++---
 kernel/unwind.c |    2 +-
 mm/tlb.c        |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
arch/ia64/kernel/traps.c +3 -3
index 765cbe5..cd5189f 100644
@@ -59,9 +59,9 @@ die (const char *str, struct pt_regs *regs, long err)
 		u32 lock_owner;
 		int lock_owner_depth;
 	} die = {
-		.lock =			SPIN_LOCK_UNLOCKED,
-		.lock_owner =		-1,
-		.lock_owner_depth =	0
+		.lock =	__SPIN_LOCK_UNLOCKED(die.lock),
+		.lock_owner = -1,
+		.lock_owner_depth = 0
 	};
 	static int die_counter;
 	int cpu = get_cpu();
arch/ia64/kernel/unwind.c +1 -1
index 93d5a3b..e3be21c 100644
@@ -145,7 +145,7 @@ static struct {
 # endif
 } unw = {
 	.tables = &unw.kernel_table,
-	.lock = SPIN_LOCK_UNLOCKED,
+	.lock = __SPIN_LOCK_UNLOCKED(unw.lock),
 	.save_order = {
 		UNW_REG_RP, UNW_REG_PFS, UNW_REG_PSP, UNW_REG_PR,
 		UNW_REG_UNAT, UNW_REG_LC, UNW_REG_FPSR, UNW_REG_PRI_UNAT_GR
arch/ia64/mm/tlb.c +3 -3
index ffad762..fa4e6d4 100644
@@ -32,9 +32,9 @@ static struct {
 } purge;
 
 struct ia64_ctx ia64_ctx = {
-	.lock =		SPIN_LOCK_UNLOCKED,
-	.next =		1,
-	.max_ctx =	~0U
+	.lock =	__SPIN_LOCK_UNLOCKED(ia64_ctx.lock),
+	.next =	1,
+	.max_ctx = ~0U
 };
 
 DEFINE_PER_CPU(u8, ia64_need_tlb_flush);
Signature · 1 line
Milind Arun Choudhary