sections: fix section conflicts in arch/score
authorAndi Kleen <ak@linux.intel.com>
Fri, 5 Oct 2012 00:11:39 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Oct 2012 18:04:39 +0000 (03:04 +0900)
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>
arch/score/kernel/sys_score.c

index e478bf9a7e9181cd2e929535aaf0c3680e71a17b..21e8679740667c8d1a2e314252f7f35cad143159 100644 (file)
@@ -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[])