Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel/lpss: Add pin control support to Intel low power subsystem
perf/x86/intel: Mark MEM_LOAD_UOPS_MISS_RETIRED as precise on SNB
x86: Remove now-unused save_rest()
x86/smpboot: Fix announce_cpu() to printk() the last "OK" properly
+6
-18
+3
-2
arch/x86/Kconfig
+3
-2
arch/x86/Kconfig
···
481
481
bool "Intel Low Power Subsystem Support"
482
482
depends on ACPI
483
483
select COMMON_CLK
484
+
select PINCTRL
484
485
---help---
485
486
Select to build support for Intel Low Power Subsystem such as
486
487
found on Intel Lynxpoint PCH. Selecting this option enables
487
-
things like clock tree (common clock framework) which are needed
488
-
by the LPSS peripheral drivers.
488
+
things like clock tree (common clock framework) and pincontrol
489
+
which are needed by the LPSS peripheral drivers.
489
490
490
491
config X86_RDC321X
491
492
bool "RDC R-321x SoC"
+1
arch/x86/kernel/cpu/perf_event_intel_ds.c
+1
arch/x86/kernel/cpu/perf_event_intel_ds.c
···
584
584
INTEL_EVENT_CONSTRAINT(0xd0, 0xf), /* MEM_UOP_RETIRED.* */
585
585
INTEL_EVENT_CONSTRAINT(0xd1, 0xf), /* MEM_LOAD_UOPS_RETIRED.* */
586
586
INTEL_EVENT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
587
+
INTEL_EVENT_CONSTRAINT(0xd3, 0xf), /* MEM_LOAD_UOPS_LLC_MISS_RETIRED.* */
587
588
INTEL_UEVENT_CONSTRAINT(0x02d4, 0xf), /* MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS */
588
589
EVENT_CONSTRAINT_END
589
590
};
-15
arch/x86/kernel/entry_64.S
-15
arch/x86/kernel/entry_64.S
···
487
487
TRACE_IRQS_OFF
488
488
.endm
489
489
490
-
ENTRY(save_rest)
491
-
PARTIAL_FRAME 1 (REST_SKIP+8)
492
-
movq 5*8+16(%rsp), %r11 /* save return address */
493
-
movq_cfi rbx, RBX+16
494
-
movq_cfi rbp, RBP+16
495
-
movq_cfi r12, R12+16
496
-
movq_cfi r13, R13+16
497
-
movq_cfi r14, R14+16
498
-
movq_cfi r15, R15+16
499
-
movq %r11, 8(%rsp) /* return address */
500
-
FIXUP_TOP_OF_STACK %r11, 16
501
-
ret
502
-
CFI_ENDPROC
503
-
END(save_rest)
504
-
505
490
/* save complete stack frame */
506
491
.pushsection .kprobes.text, "ax"
507
492
ENTRY(save_paranoid)
+2
-1
arch/x86/kernel/smpboot.c
+2
-1
arch/x86/kernel/smpboot.c
···
653
653
{
654
654
static int current_node = -1;
655
655
int node = early_cpu_to_node(cpu);
656
+
int max_cpu_present = find_last_bit(cpumask_bits(cpu_present_mask), NR_CPUS);
656
657
657
658
if (system_state == SYSTEM_BOOTING) {
658
659
if (node != current_node) {
···
662
661
current_node = node;
663
662
pr_info("Booting Node %3d, Processors ", node);
664
663
}
665
-
pr_cont(" #%d%s", cpu, cpu == (nr_cpu_ids - 1) ? " OK\n" : "");
664
+
pr_cont(" #%4d%s", cpu, cpu == max_cpu_present ? " OK\n" : "");
666
665
return;
667
666
} else
668
667
pr_info("Booting Node %d Processor %d APIC 0x%x\n",