Skip to content

Commit

Permalink
uml: get rid of asmlinkage
Browse files Browse the repository at this point in the history
Get rid of asmlinkage and remove some old cruft from asm/linkage.h.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 5, 2008
1 parent c112746 commit b2cf770
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
9 changes: 5 additions & 4 deletions arch/um/sys-i386/tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ int arch_copy_tls(struct task_struct *new)
}

/* 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;

Expand Down Expand Up @@ -263,7 +264,7 @@ static int get_tls_entry(struct task_struct* task, struct user_desc *info, int i
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;
Expand Down Expand Up @@ -298,7 +299,7 @@ asmlinkage int sys_set_thread_area(struct user_desc __user *user_desc)
* i386. However the only possible error are caused by bugs.
*/
int ptrace_set_thread_area(struct task_struct *child, int idx,
struct user_desc __user *user_desc)
struct user_desc __user *user_desc)
{
struct user_desc info;

Expand All @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions include/asm-um/linkage.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,4 @@

#include "asm/arch/linkage.h"


/* <linux/linkage.h> will pick sane defaults */
#ifdef CONFIG_GPROF
#undef fastcall
#endif

#endif

0 comments on commit b2cf770

Please sign in to comment.