From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 28 Sep 2012 00:20:03 +0000 (+1000)
Subject: sections: fix section conflicts in arch/score
X-Git-Tag: next-20120928~1^2~188
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=081c7f89b8bc01e7b444300fddd3a388968ebbb3;p=karo-tx-linux.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>
---

diff --git a/arch/score/kernel/sys_score.c b/arch/score/kernel/sys_score.c
index e478bf9a7e91..21e867974066 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[])