diff --git a/[refs] b/[refs] index 1f2c27c41809..cf60ea5d940d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d0bea5ea4a0e91feff22ac5e32e14ff3a682247 +refs/heads/master: 99df5a6a215f026e62287083de2b44b22edd3623 diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h index 4da6ede74401..1d7f4830a80d 100644 --- a/trunk/kernel/trace/trace.h +++ b/trunk/kernel/trace/trace.h @@ -100,7 +100,7 @@ struct syscall_trace_enter { struct syscall_trace_exit { struct trace_entry ent; int nr; - unsigned long ret; + long ret; }; struct kprobe_trace_entry {