Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
watchdog: Quiet down the boot messages
perf/x86: Fix broken LBR fixup code
tracing: Have tracing_off() actually turn tracing off
+20
-3
+1
-1
arch/x86/lib/usercopy.c
+1
-1
arch/x86/lib/usercopy.c
+1
-1
kernel/trace/trace.c
+1
-1
kernel/trace/trace.c
···
371
371
void tracing_off(void)
372
372
{
373
373
if (global_trace.buffer)
374
-
ring_buffer_record_on(global_trace.buffer);
374
+
ring_buffer_record_off(global_trace.buffer);
375
375
/*
376
376
* This flag is only looked at when buffers haven't been
377
377
* allocated yet. We don't really care about the race
+18
-1
kernel/watchdog.c
+18
-1
kernel/watchdog.c
···
372
372
373
373
374
374
#ifdef CONFIG_HARDLOCKUP_DETECTOR
375
+
/*
376
+
* People like the simple clean cpu node info on boot.
377
+
* Reduce the watchdog noise by only printing messages
378
+
* that are different from what cpu0 displayed.
379
+
*/
380
+
static unsigned long cpu0_err;
381
+
375
382
static int watchdog_nmi_enable(int cpu)
376
383
{
377
384
struct perf_event_attr *wd_attr;
···
397
390
398
391
/* Try to register using hardware perf events */
399
392
event = perf_event_create_kernel_counter(wd_attr, cpu, NULL, watchdog_overflow_callback, NULL);
393
+
394
+
/* save cpu0 error for future comparision */
395
+
if (cpu == 0 && IS_ERR(event))
396
+
cpu0_err = PTR_ERR(event);
397
+
400
398
if (!IS_ERR(event)) {
401
-
pr_info("enabled, takes one hw-pmu counter.\n");
399
+
/* only print for cpu0 or different than cpu0 */
400
+
if (cpu == 0 || cpu0_err)
401
+
pr_info("enabled on all CPUs, permanently consumes one hw-PMU counter.\n");
402
402
goto out_save;
403
403
}
404
404
405
+
/* skip displaying the same error again */
406
+
if (cpu > 0 && (PTR_ERR(event) == cpu0_err))
407
+
return PTR_ERR(event);
405
408
406
409
/* vary the KERN level based on the returned errno */
407
410
if (PTR_ERR(event) == -EOPNOTSUPP)