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

Commit b2cf7707 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: get rid of asmlinkage 



Get rid of asmlinkage and remove some old cruft from asm/linkage.h.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1127465

arch/um/sys-i386/tls.c

+5 −4
Original line number Diff line number Diff line
@@ -225,7 +225,8 @@ out: 
}



/* XXX: use do_get_thread_area to read the host value? I'm not at all sure! */

static int get_tls_entry(struct task_struct* task, struct user_desc *info, int idx)

static int get_tls_entry(struct task_struct *task, struct user_desc *info,

			 int idx)

{

	struct thread_struct *t = &task->thread;
@@ -263,7 +264,7 @@ clear: 
	goto out;

}



asmlinkage int sys_set_thread_area(struct user_desc __user *user_desc)

int sys_set_thread_area(struct user_desc __user *user_desc)

{

	struct user_desc info;

	int idx, ret;
@@ -311,7 +312,7 @@ int ptrace_set_thread_area(struct task_struct *child, int idx, 
	return set_tls_entry(child, &info, idx, 0);

}



asmlinkage int sys_get_thread_area(struct user_desc __user *user_desc)

int sys_get_thread_area(struct user_desc __user *user_desc)

{

	struct user_desc info;

	int idx, ret;

include/asm-um/linkage.h

+0 −6
Original line number Diff line number Diff line
@@ -3,10 +3,4 @@ 


#include "asm/arch/linkage.h"





/* <linux/linkage.h> will pick sane defaults */

#ifdef CONFIG_GPROF

#undef fastcall

#endif



#endif