aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-12-18 09:41:13 -0500
committerMichal Simek <michal.simek@xilinx.com>2015-01-05 06:36:43 -0500
commit8543e6c96762fcc930af5725088c2b9e4865c3aa (patch)
treee8551350abb07213efd47632e44452de615f818a
parentf396a4d2314bf1cb83148d9b8fc47995e6c27e1f (diff)
microblaze: Use unsigned return type in do_syscall_trace_enter
Registers are not signed types. The patch removes warnings: arch/microblaze/kernel/ptrace.c: In function 'do_syscall_trace_enter': arch/microblaze/kernel/ptrace.c:152:14: warning: signed and unsigned type in conditional expression [-Wsign-compare] return ret ?: regs->r12; Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/microblaze/include/asm/syscall.h2
-rw-r--r--arch/microblaze/kernel/ptrace.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h
index 53cfaf34c343..04a5bece8168 100644
--- a/arch/microblaze/include/asm/syscall.h
+++ b/arch/microblaze/include/asm/syscall.h
@@ -97,7 +97,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
97 microblaze_set_syscall_arg(regs, i++, *args++); 97 microblaze_set_syscall_arg(regs, i++, *args++);
98} 98}
99 99
100asmlinkage long do_syscall_trace_enter(struct pt_regs *regs); 100asmlinkage unsigned long do_syscall_trace_enter(struct pt_regs *regs);
101asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); 101asmlinkage void do_syscall_trace_leave(struct pt_regs *regs);
102 102
103static inline int syscall_get_arch(void) 103static inline int syscall_get_arch(void)
diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
index bb10637ce688..8cfa98cadf3d 100644
--- a/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
@@ -132,9 +132,9 @@ long arch_ptrace(struct task_struct *child, long request,
132 return rval; 132 return rval;
133} 133}
134 134
135asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) 135asmlinkage unsigned long do_syscall_trace_enter(struct pt_regs *regs)
136{ 136{
137 long ret = 0; 137 unsigned long ret = 0;
138 138
139 secure_computing_strict(regs->r12); 139 secure_computing_strict(regs->r12);
140 140