diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-28 13:11:28 -0700 |
commit | 7d50d07da23995a18ac449636cb42aec2cb2808d (patch) | |
tree | 0ddf940a5e9ddc5eeebc996601d7fee3c36ab836 /arch/arm/kernel/perf_event.c | |
parent | 2decb194e65ab66eaf787512dc572cdc99893b24 (diff) | |
parent | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (diff) |
Merge remote branch 'linus/master' into x86/cpu
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
-rw-r--r-- | arch/arm/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index c45768614c8a..de12536d687f 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -201,7 +201,7 @@ armpmu_event_update(struct perf_event *event, { int shift = 64 - 32; s64 prev_raw_count, new_raw_count; - s64 delta; + u64 delta; again: prev_raw_count = atomic64_read(&hwc->prev_count); |