Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37d6fa34 authored Jul 26, 2013 by Kirill Tkhai Committed by David S. Miller Jul 31, 2013

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>

parent 7a3b0f89

arch/sparc/include/asm/switch_to_64.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,8 +48,8 @@ do { save_and_clear_fpu(); \
		"wrpr %%g0, 14, %%pil\n\t" \
		"brz,pt %%o7, switch_to_pc\n\t" \
		" mov %%g7, %0\n\t" \
		"sethi %%hi(ret_from_syscall), %%g1\n\t" \
		"jmpl %%g1 + %%lo(ret_from_syscall), %%g0\n\t" \
		"sethi %%hi(ret_from_fork), %%g1\n\t" \
		"jmpl %%g1 + %%lo(ret_from_fork), %%g0\n\t" \
		" nop\n\t" \
		".globl switch_to_pc\n\t" \
		"switch_to_pc:\n\t" \

arch/sparc/kernel/kgdb_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ void sleeping_thread_to_gdb_regs(unsigned long gdb_regs, struct task_struct p)
		{
		struct thread_info *t = task_thread_info(p);
		extern unsigned int switch_to_pc;
		extern unsigned int ret_from_syscall;
		extern unsigned int ret_from_fork;
		struct reg_window *win;
		unsigned long pc, cwp;
		int i;
		@@ -66,7 +66,7 @@ void sleeping_thread_to_gdb_regs(unsigned long gdb_regs, struct task_struct p)
		gdb_regs[i] = 0;

		if (t->new_child)
		pc = (unsigned long) &ret_from_syscall;
		pc = (unsigned long) &ret_from_fork;
		else
		pc = (unsigned long) &switch_to_pc;

arch/sparc/kernel/syscalls.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,8 +98,8 @@ sys_clone:
		ba,pt %xcc, sparc_do_fork
		add %sp, PTREGS_OFF, %o2

		.globl ret_from_syscall
		ret_from_syscall:
		.globl ret_from_fork
		ret_from_fork:
		/* Clear current_thread_info()->new_child. */
		stb %g0, [%g6 + TI_NEW_CHILD]
		call schedule_tail