aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorKirill Tkhai <tkhai@yandex.ru>2013-07-26 08:42:39 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-31 22:10:04 -0400
commit37d6fa34a7f7b16799d0a7c009fcb74fbf090377 (patch)
treece9f1262da7e40bed96d52072fae7cf4aa66903c /arch/sparc
parent7a3b0f89e3fea680f93932691ca41a68eee7ab5e (diff)
sparc64: cleanup: Rename ret_from_syscall to ret_from_fork
Rename to make the function name better conform to its goal. Signed-off-by: Kirill Tkhai <tkhai@yandex.ru> CC: David Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/switch_to_64.h4
-rw-r--r--arch/sparc/kernel/kgdb_64.c4
-rw-r--r--arch/sparc/kernel/syscalls.S4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h
index c7de3323819c..8d284801f232 100644
--- a/arch/sparc/include/asm/switch_to_64.h
+++ b/arch/sparc/include/asm/switch_to_64.h
@@ -48,8 +48,8 @@ do { save_and_clear_fpu(); \
48 "wrpr %%g0, 14, %%pil\n\t" \ 48 "wrpr %%g0, 14, %%pil\n\t" \
49 "brz,pt %%o7, switch_to_pc\n\t" \ 49 "brz,pt %%o7, switch_to_pc\n\t" \
50 " mov %%g7, %0\n\t" \ 50 " mov %%g7, %0\n\t" \
51 "sethi %%hi(ret_from_syscall), %%g1\n\t" \ 51 "sethi %%hi(ret_from_fork), %%g1\n\t" \
52 "jmpl %%g1 + %%lo(ret_from_syscall), %%g0\n\t" \ 52 "jmpl %%g1 + %%lo(ret_from_fork), %%g0\n\t" \
53 " nop\n\t" \ 53 " nop\n\t" \
54 ".globl switch_to_pc\n\t" \ 54 ".globl switch_to_pc\n\t" \
55 "switch_to_pc:\n\t" \ 55 "switch_to_pc:\n\t" \
diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
index c8759550799f..53c0a82e6030 100644
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/arch/sparc/kernel/kgdb_64.c
@@ -42,7 +42,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
42{ 42{
43 struct thread_info *t = task_thread_info(p); 43 struct thread_info *t = task_thread_info(p);
44 extern unsigned int switch_to_pc; 44 extern unsigned int switch_to_pc;
45 extern unsigned int ret_from_syscall; 45 extern unsigned int ret_from_fork;
46 struct reg_window *win; 46 struct reg_window *win;
47 unsigned long pc, cwp; 47 unsigned long pc, cwp;
48 int i; 48 int i;
@@ -66,7 +66,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
66 gdb_regs[i] = 0; 66 gdb_regs[i] = 0;
67 67
68 if (t->new_child) 68 if (t->new_child)
69 pc = (unsigned long) &ret_from_syscall; 69 pc = (unsigned long) &ret_from_fork;
70 else 70 else
71 pc = (unsigned long) &switch_to_pc; 71 pc = (unsigned long) &switch_to_pc;
72 72
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 22a1098961f5..868ed222206c 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -98,8 +98,8 @@ sys_clone:
98 ba,pt %xcc, sparc_do_fork 98 ba,pt %xcc, sparc_do_fork
99 add %sp, PTREGS_OFF, %o2 99 add %sp, PTREGS_OFF, %o2
100 100
101 .globl ret_from_syscall 101 .globl ret_from_fork
102ret_from_syscall: 102ret_from_fork:
103 /* Clear current_thread_info()->new_child. */ 103 /* Clear current_thread_info()->new_child. */
104 stb %g0, [%g6 + TI_NEW_CHILD] 104 stb %g0, [%g6 + TI_NEW_CHILD]
105 call schedule_tail 105 call schedule_tail