aboutsummaryrefslogtreecommitdiffstats
path: root/arch/score
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 20:11:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:04:39 -0400
commit458fe42529a2510c026afa8fc04f07d2f9d8ab78 (patch)
tree4034011e25e6c03d0057158004c56946fb620ff0 /arch/score
parent9597abe00c1bab2aedce6b49866bf6d1e81c9eed (diff)
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>
Diffstat (limited to 'arch/score')
-rw-r--r--arch/score/kernel/sys_score.c1
1 files changed, 1 insertions, 0 deletions
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)
112 * Do a system call from kernel instead of calling sys_execve so we 112 * Do a system call from kernel instead of calling sys_execve so we
113 * end up with proper pt_regs. 113 * end up with proper pt_regs.
114 */ 114 */
115asmlinkage
115int kernel_execve(const char *filename, 116int kernel_execve(const char *filename,
116 const char *const argv[], 117 const char *const argv[],
117 const char *const envp[]) 118 const char *const envp[])