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

Commit 1b4ac2a9 authored by Richard Weinberger's avatar Richard Weinberger Committed by Thomas Gleixner
Browse files

x86: Get rid of asmregparm 



As UML does no longer need asmregparm we can remove it.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Cc: namhyung@gmail.com
Cc: davem@davemloft.net
Cc: fweisbec@gmail.com
Cc: dhowells@redhat.com
Link: http://lkml.kernel.org/r/%3C1306189085-29896-1-git-send-email-richard%40nod.at%3E


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3a367907

arch/x86/include/asm/linkage.h

+0 −5
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ 


#ifdef CONFIG_X86_32

#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))

/*

 * For 32-bit UML - mark functions implemented in assembly that use

 * regparm input parameters:

 */

#define asmregparm __attribute__((regparm(3)))



/*

 * Make sure the compiler doesn't do anything stupid with the

arch/x86/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, 
 * We must return the syscall number to actually look up in the table.

 * This can be -1L to skip running any syscall at all.

 */

asmregparm long syscall_trace_enter(struct pt_regs *regs)

long syscall_trace_enter(struct pt_regs *regs)

{

	long ret = 0;
@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs) 
	return ret ?: regs->orig_ax;

}



asmregparm void syscall_trace_leave(struct pt_regs *regs)

void syscall_trace_leave(struct pt_regs *regs)

{

	bool step;

include/linux/linkage.h

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
#define asmlinkage CPP_ASMLINKAGE

#endif



#ifndef asmregparm

# define asmregparm

#endif



#define __page_aligned_data	__section(.data..page_aligned) __aligned(PAGE_SIZE)

#define __page_aligned_bss	__section(.bss..page_aligned) __aligned(PAGE_SIZE)