浏览代码

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: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jeff Dike 17 年之前
父节点
当前提交
b2cf770758
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 5 4
      arch/um/sys-i386/tls.c
  2. 0 6
      include/asm-um/linkage.h

+ 5 - 4
arch/um/sys-i386/tls.c

@@ -225,7 +225,8 @@ out:
 }
 }
 
 
 /* XXX: use do_get_thread_area to read the host value? I'm not at all sure! */
 /* 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;
 	struct thread_struct *t = &task->thread;
 
 
@@ -263,7 +264,7 @@ clear:
 	goto out;
 	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;
 	struct user_desc info;
 	int idx, ret;
 	int idx, ret;
@@ -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.
  * i386. However the only possible error are caused by bugs.
  */
  */
 int ptrace_set_thread_area(struct task_struct *child, int idx,
 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;
 	struct user_desc info;
 
 
@@ -311,7 +312,7 @@ int ptrace_set_thread_area(struct task_struct *child, int idx,
 	return set_tls_entry(child, &info, idx, 0);
 	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;
 	struct user_desc info;
 	int idx, ret;
 	int idx, ret;

+ 0 - 6
include/asm-um/linkage.h

@@ -3,10 +3,4 @@
 
 
 #include "asm/arch/linkage.h"
 #include "asm/arch/linkage.h"
 
 
-
-/* <linux/linkage.h> will pick sane defaults */
-#ifdef CONFIG_GPROF
-#undef fastcall
-#endif
-
 #endif
 #endif