diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 15:09:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 15:09:26 -0500 |
| commit | 9d0cf6f56454c8a71e0aa2c3b9c6cbe470eb2788 (patch) | |
| tree | e13191d786b097bc6d81e41b2ae7f66f8c1ccb74 /arch/x86/platform | |
| parent | d82012695ef29e4e1c8153ccf43098ec8e50369e (diff) | |
| parent | 3736708f034ae1e8c62789ed737e8b90d5b40210 (diff) | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm updates from Ingo Molnar:
"Misc changes:
- context switch micro-optimization
- debug printout micro-optimization
- comment enhancements and typo fix"
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Replace seq_printf() with seq_puts()
x86/asm: Fix typo in arch/x86/kernel/asm_offset_64.c
sched/x86: Add a comment clarifying LDT context switching
sched/x86_64: Don't save flags on context switch
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/uv/tlb_uv.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 3968d67d366b..ab4062c5953c 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c | |||
| @@ -1367,20 +1367,18 @@ static int ptc_seq_show(struct seq_file *file, void *data) | |||
| 1367 | 1367 | ||
| 1368 | cpu = *(loff_t *)data; | 1368 | cpu = *(loff_t *)data; |
| 1369 | if (!cpu) { | 1369 | if (!cpu) { |
| 1370 | seq_printf(file, | 1370 | seq_puts(file, |
| 1371 | "# cpu bauoff sent stime self locals remotes ncpus localhub "); | 1371 | "# cpu bauoff sent stime self locals remotes ncpus localhub "); |
| 1372 | seq_printf(file, | 1372 | seq_puts(file, "remotehub numuvhubs numuvhubs16 numuvhubs8 "); |
| 1373 | "remotehub numuvhubs numuvhubs16 numuvhubs8 "); | 1373 | seq_puts(file, |
| 1374 | seq_printf(file, | 1374 | "numuvhubs4 numuvhubs2 numuvhubs1 dto snacks retries "); |
| 1375 | "numuvhubs4 numuvhubs2 numuvhubs1 dto snacks retries "); | 1375 | seq_puts(file, |
| 1376 | seq_printf(file, | 1376 | "rok resetp resett giveup sto bz throt disable "); |
| 1377 | "rok resetp resett giveup sto bz throt disable "); | 1377 | seq_puts(file, |
| 1378 | seq_printf(file, | 1378 | "enable wars warshw warwaits enters ipidis plugged "); |
| 1379 | "enable wars warshw warwaits enters ipidis plugged "); | 1379 | seq_puts(file, |
| 1380 | seq_printf(file, | 1380 | "ipiover glim cong swack recv rtime all one mult "); |
| 1381 | "ipiover glim cong swack recv rtime all one mult "); | 1381 | seq_puts(file, "none retry canc nocan reset rcan\n"); |
| 1382 | seq_printf(file, | ||
| 1383 | "none retry canc nocan reset rcan\n"); | ||
| 1384 | } | 1382 | } |
| 1385 | if (cpu < num_possible_cpus() && cpu_online(cpu)) { | 1383 | if (cpu < num_possible_cpus() && cpu_online(cpu)) { |
| 1386 | bcp = &per_cpu(bau_control, cpu); | 1384 | bcp = &per_cpu(bau_control, cpu); |