[PATCH] remove LOCK_SECTION from x86_64 spin_lock asm

From: Zwane Mwaikambo
Date: Wed Sep 15 2004 - 15:04:28 EST


William spotted this stray bit, LOCK_SECTION isn't used anymore on x86_64.
Andrew i've diffed against -mm because i'd like for the irq enable on
contention patch to be merged, i believe making spinlock functions out
of line was a prerequisite Andi wanted before agreeing to the irq enable
code.

Signed-off-by: Zwane Mwaikambo <zwane@xxxxxxxxxxx>

Index: linux-2.6.9-rc1-mm5/include/asm-x86_64/spinlock.h
===================================================================
RCS file: /home/cvsroot/linux-2.6.9-rc1-mm5/include/asm-x86_64/spinlock.h,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 spinlock.h
--- linux-2.6.9-rc1-mm5/include/asm-x86_64/spinlock.h 13 Sep 2004 12:46:47 -0000 1.1.1.1
+++ linux-2.6.9-rc1-mm5/include/asm-x86_64/spinlock.h 15 Sep 2004 08:47:52 -0000
@@ -45,20 +45,18 @@ typedef struct {
#define spin_lock_string \
"\n1:\t" \
"lock ; decb %0\n\t" \
- "js 2f\n" \
- LOCK_SECTION_START("") \
+ "jns 3f\n" \
"2:\t" \
"rep;nop\n\t" \
"cmpb $0,%0\n\t" \
"jle 2b\n\t" \
"jmp 1b\n" \
- LOCK_SECTION_END
+ "3:\n\t"

#define spin_lock_string_flags \
"\n1:\t" \
"lock ; decb %0\n\t" \
- "js 2f\n\t" \
- LOCK_SECTION_START("") \
+ "jns 4f\n\t" \
"2:\t" \
"test $0x200, %1\n\t" \
"jz 3f\n\t" \
@@ -69,7 +67,7 @@ typedef struct {
"jle 3b\n\t" \
"cli\n\t" \
"jmp 1b\n" \
- LOCK_SECTION_END
+ "4:\n\t"

/*
* This works. Despite all the confusion.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/