diff --git a/[refs] b/[refs] index 792e30f60499..ea7120f9df97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 866ecfdd7cf05680acba635ecf7f30695d8039db +refs/heads/master: 7456a29bcf3484dee37457370f89d57814299c76 diff --git a/trunk/arch/ia64/kernel/perfmon.c b/trunk/arch/ia64/kernel/perfmon.c index 3fa4bc536953..79826c13b8b6 100644 --- a/trunk/arch/ia64/kernel/perfmon.c +++ b/trunk/arch/ia64/kernel/perfmon.c @@ -4791,6 +4791,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) int narg, completed_args = 0, call_made = 0, cmd_flags; int (*func)(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs); int (*getsize)(void *arg, size_t *sz); + int fput_needed; #define PFM_MAX_ARGSIZE 4096 /* @@ -4879,7 +4880,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) ret = -EBADF; - file = fget(fd); + file = fget_light(fd, &fput_needed); if (unlikely(file == NULL)) { DPRINT(("invalid fd %d\n", fd)); goto error_args; @@ -4920,7 +4921,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) error_args: if (file) - fput(file); + fput_light(file, fput_needed); kfree(args_k);