From 21d26d613e05c770332a9f3543d22822435ad76c Mon Sep 17 00:00:00 2001 From: Ian Munsie Date: Thu, 3 Feb 2011 14:27:21 +1100 Subject: [PATCH] --- yaml --- r: 234431 b: refs/heads/master c: 3773b389b6927595512558594d040c1edba46f36 h: refs/heads/master i: 234429: 5291a4d024d91287595baa1b793b1afdc24eba4e 234427: e8a0807d246b70a8ea1b3ccd160f3a1a577f0b5a 234423: 82a7a1c2ea435ec3d81ac131c33bcd719fec16cb 234415: b3edd0d8b92b00c45e55e13a7bbd13bb5f9756d4 234399: 5f479715a2b2d1e9d2969b03d254dbe6900341fc 234367: f76ec438d205bbdc124c16b409132c280c5aebff v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_syscalls.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 56a97b8a1bf3..8fc34bb34f01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba976970c79fd2fbfe1a4b3b6766a318f4eb9d4c +refs/heads/master: 3773b389b6927595512558594d040c1edba46f36 diff --git a/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c index a9ceabd52247..423094288fb5 100644 --- a/trunk/kernel/trace/trace_syscalls.c +++ b/trunk/kernel/trace/trace_syscalls.c @@ -359,7 +359,7 @@ int reg_event_syscall_enter(struct ftrace_event_call *call) int num; num = ((struct syscall_metadata *)call->data)->syscall_nr; - if (num < 0 || num >= NR_syscalls) + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) return -ENOSYS; mutex_lock(&syscall_trace_lock); if (!sys_refcount_enter) @@ -377,7 +377,7 @@ void unreg_event_syscall_enter(struct ftrace_event_call *call) int num; num = ((struct syscall_metadata *)call->data)->syscall_nr; - if (num < 0 || num >= NR_syscalls) + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) return; mutex_lock(&syscall_trace_lock); sys_refcount_enter--; @@ -393,7 +393,7 @@ int reg_event_syscall_exit(struct ftrace_event_call *call) int num; num = ((struct syscall_metadata *)call->data)->syscall_nr; - if (num < 0 || num >= NR_syscalls) + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) return -ENOSYS; mutex_lock(&syscall_trace_lock); if (!sys_refcount_exit) @@ -411,7 +411,7 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call) int num; num = ((struct syscall_metadata *)call->data)->syscall_nr; - if (num < 0 || num >= NR_syscalls) + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) return; mutex_lock(&syscall_trace_lock); sys_refcount_exit--;