From 0e165604438d40c8633b448244985fbadd842d6e Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 11 May 2009 15:50:21 +1000 Subject: [PATCH] --- yaml --- r: 147445 b: refs/heads/master c: 615a3f1e055ac9b0ae74e1f935a12ea2cfe2a2ad h: refs/heads/master i: 147443: df64c3efebc9a1e9d746643423c20fe77ffc02bc v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 88578d027366..5fcb0cd5a086 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a08b159fc243dbfe415250466d24cfc5010deee5 +refs/heads/master: 615a3f1e055ac9b0ae74e1f935a12ea2cfe2a2ad diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 7373b96bc36c..5ea0240adab2 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -1281,7 +1281,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait) static void perf_counter_reset(struct perf_counter *counter) { (void)perf_counter_read(counter); - atomic_set(&counter->count, 0); + atomic64_set(&counter->count, 0); perf_counter_update_userpage(counter); }