From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 5 Oct 2012 00:11:39 +0000 (-0700)
Subject: sections: fix section conflicts in arch/score
X-Git-Tag: v3.7-rc1~110^2~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=458fe42529a2510c026afa8fc04f07d2f9d8ab78;p=thirdparty%2Fkernel%2Flinux.git

sections: fix section conflicts in arch/score

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/score/kernel/sys_score.c b/arch/score/kernel/sys_score.c
index e478bf9a7e918..21e8679740667 100644
--- a/arch/score/kernel/sys_score.c
+++ b/arch/score/kernel/sys_score.c
@@ -112,6 +112,7 @@ score_execve(struct pt_regs *regs)
  * Do a system call from kernel instead of calling sys_execve so we
  * end up with proper pt_regs.
  */
+asmlinkage
 int kernel_execve(const char *filename,
 		  const char *const argv[],
 		  const char *const envp[])