diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/otus/80211core/performance.c | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/otus/80211core/performance.c')
| -rw-r--r-- | drivers/staging/otus/80211core/performance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/otus/80211core/performance.c b/drivers/staging/otus/80211core/performance.c index 51b42d54f653..4c10e1d7afd6 100644 --- a/drivers/staging/otus/80211core/performance.c +++ b/drivers/staging/otus/80211core/performance.c @@ -27,9 +27,9 @@ #ifdef ZM_ENABLE_PERFORMANCE_EVALUATION #define ZM_TP_SIZE 50 -struct zsSummary zm_summary; -struct zsVariation zm_var; -struct zsThroughput zm_tp; +static struct zsSummary zm_summary; +static struct zsVariation zm_var; +static struct zsThroughput zm_tp; void zfiPerformanceInit(zdev_t* dev) { |