diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 13:49:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 13:49:05 -0400 |
| commit | 89c5bd08df5841326abbf167d136bcf14cf759ed (patch) | |
| tree | 064edb874800f4f233713c33bc555d58240bd963 /tools/perf/arch/x86/util/header.c | |
| parent | 762ad8a5330325b789cfb6dc896f81cf273ff4e9 (diff) | |
| parent | eae7a755ee81129370c8f555b0d5672e6673735d (diff) | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Some corner case fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/arch/x86/util/header.c')
| -rw-r--r-- | tools/perf/arch/x86/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c index f94006068d2b..146d12a1cec0 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c | |||
| @@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz) | |||
| 48 | if (family >= 0x6) | 48 | if (family >= 0x6) |
| 49 | model += ((a >> 16) & 0xf) << 4; | 49 | model += ((a >> 16) & 0xf) << 4; |
| 50 | } | 50 | } |
| 51 | nb = snprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step); | 51 | nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step); |
| 52 | 52 | ||
| 53 | /* look for end marker to ensure the entire data fit */ | 53 | /* look for end marker to ensure the entire data fit */ |
| 54 | if (strchr(buffer, '$')) { | 54 | if (strchr(buffer, '$')) { |