From 1816d9a6258a22e8624193ecac49d46ac95541e5 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 26 Dec 2008 21:05:06 -0800 Subject: [PATCH] --- yaml --- r: 147182 b: refs/heads/master c: 01ea1ccaa24dea3552e103be13b7897211607a8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d60825a36300..65c1c097eec0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e44aef58ecfbe061eb4c53b939bcc35fb1bee82d +refs/heads/master: 01ea1ccaa24dea3552e103be13b7897211607a8b diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index d7a79f321b1c..37f771691f93 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -45,8 +45,8 @@ hw_perf_counter_init(struct perf_counter *counter) } u64 __weak hw_perf_save_disable(void) { return 0; } -void __weak hw_perf_restore(u64 ctrl) { } -void __weak hw_perf_counter_setup(void) { } +void __weak hw_perf_restore(u64 ctrl) { barrier(); } +void __weak hw_perf_counter_setup(void) { barrier(); } static void list_add_counter(struct perf_counter *counter, struct perf_counter_context *ctx)