diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-19 19:03:48 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-03 05:26:00 -0500 |
commit | 75ddb0e87d0d31ad44d574e7fe2e962e4efecadb (patch) | |
tree | 4335f27853fceeab31cc9683579f80a968738793 | |
parent | 2b55f3672c77e76b62efd0dba6bf29addac071fd (diff) |
Rename .text.lock to .text..lock.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | Documentation/mutex-design.txt | 4 | ||||
-rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 4 | ||||
-rw-r--r-- | arch/m68knommu/kernel/vmlinux.lds.S | 2 | ||||
-rw-r--r-- | include/linux/spinlock.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt index aa60d1f627e5..c91ccc0720fa 100644 --- a/Documentation/mutex-design.txt +++ b/Documentation/mutex-design.txt | |||
@@ -66,14 +66,14 @@ of advantages of mutexes: | |||
66 | 66 | ||
67 | c0377ccb <mutex_lock>: | 67 | c0377ccb <mutex_lock>: |
68 | c0377ccb: f0 ff 08 lock decl (%eax) | 68 | c0377ccb: f0 ff 08 lock decl (%eax) |
69 | c0377cce: 78 0e js c0377cde <.text.lock.mutex> | 69 | c0377cce: 78 0e js c0377cde <.text..lock.mutex> |
70 | c0377cd0: c3 ret | 70 | c0377cd0: c3 ret |
71 | 71 | ||
72 | the unlocking fastpath is equally tight: | 72 | the unlocking fastpath is equally tight: |
73 | 73 | ||
74 | c0377cd1 <mutex_unlock>: | 74 | c0377cd1 <mutex_unlock>: |
75 | c0377cd1: f0 ff 00 lock incl (%eax) | 75 | c0377cd1: f0 ff 00 lock incl (%eax) |
76 | c0377cd4: 7e 0f jle c0377ce5 <.text.lock.mutex+0x7> | 76 | c0377cd4: 7e 0f jle c0377ce5 <.text..lock.mutex+0x7> |
77 | c0377cd6: c3 ret | 77 | c0377cd6: c3 ret |
78 | 78 | ||
79 | - 'struct mutex' semantics are well-defined and are enforced if | 79 | - 'struct mutex' semantics are well-defined and are enforced if |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 5c01d3c7020d..e07218a2577f 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -54,8 +54,8 @@ SECTIONS | |||
54 | .text2 : AT(ADDR(.text2) - LOAD_OFFSET) | 54 | .text2 : AT(ADDR(.text2) - LOAD_OFFSET) |
55 | { *(.text2) } | 55 | { *(.text2) } |
56 | #ifdef CONFIG_SMP | 56 | #ifdef CONFIG_SMP |
57 | .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET) | 57 | .text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET) |
58 | { *(.text.lock) } | 58 | { *(.text..lock) } |
59 | #endif | 59 | #endif |
60 | _etext = .; | 60 | _etext = .; |
61 | 61 | ||
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 9f1784f586b9..fd3df56fc458 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
@@ -68,7 +68,7 @@ SECTIONS { | |||
68 | TEXT_TEXT | 68 | TEXT_TEXT |
69 | SCHED_TEXT | 69 | SCHED_TEXT |
70 | LOCK_TEXT | 70 | LOCK_TEXT |
71 | *(.text.lock) | 71 | *(.text..lock) |
72 | 72 | ||
73 | . = ALIGN(16); /* Exception table */ | 73 | . = ALIGN(16); /* Exception table */ |
74 | __start___ex_table = .; | 74 | __start___ex_table = .; |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 86088213334a..dd57af413266 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
@@ -60,7 +60,7 @@ | |||
60 | /* | 60 | /* |
61 | * Must define these before including other files, inline functions need them | 61 | * Must define these before including other files, inline functions need them |
62 | */ | 62 | */ |
63 | #define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME | 63 | #define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME |
64 | 64 | ||
65 | #define LOCK_SECTION_START(extra) \ | 65 | #define LOCK_SECTION_START(extra) \ |
66 | ".subsection 1\n\t" \ | 66 | ".subsection 1\n\t" \ |