summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-28 13:04:47 -0700
committerDavid S. Miller <davem@davemloft.net>2012-10-28 13:04:47 -0700
commit187818cd6a5ab6343eac47e52da2f3e40c544b98 (patch)
tree09b55dad78359ae7e047f3eb533844adaa4094c6 /arch/sparc/kernel
parente9b9eb59ffcdee09ec96b040f85c919618f4043e (diff)
sparc64: Improvde documentation and readability of atomic backoff code.
Document what's going on in asm/backoff.h with a large and descriptive comment. Refer to it above the cpu_relax() definition in asm/processor_64.h Rename the pause patching section to have "3insn" in it's name like the other patching sections do. Based upon feedback from Sam Ravnborg. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/entry.h4
-rw-r--r--arch/sparc/kernel/setup_64.c4
-rw-r--r--arch/sparc/kernel/vmlinux.lds.S8
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index 51742df63c75..cc3c5cb47cda 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -63,8 +63,8 @@ struct pause_patch_entry {
unsigned int addr;
unsigned int insns[3];
};
-extern struct pause_patch_entry __pause_patch,
- __pause_patch_end;
+extern struct pause_patch_entry __pause_3insn_patch,
+ __pause_3insn_patch_end;
extern void __init per_cpu_patch(void);
extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index b45cff408de3..0eaf0059aaef 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -320,8 +320,8 @@ static void __init pause_patch(void)
{
struct pause_patch_entry *p;
- p = &__pause_patch;
- while (p < &__pause_patch_end) {
+ p = &__pause_3insn_patch;
+ while (p < &__pause_3insn_patch_end) {
unsigned long i, addr = p->addr;
for (i = 0; i < 3; i++) {
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 847f9f793618..0bacceb19150 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -132,10 +132,10 @@ SECTIONS
*(.popc_6insn_patch)
__popc_6insn_patch_end = .;
}
- .pause_patch : {
- __pause_patch = .;
- *(.pause_patch)
- __pause_patch_end = .;
+ .pause_3insn_patch : {
+ __pause_3insn_patch = .;
+ *(.pause_3insn_patch)
+ __pause_3insn_patch_end = .;
}
PERCPU_SECTION(SMP_CACHE_BYTES)