Commit 970216e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_misc_for_v7.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 updates from Borislav Petkov:

 - Reference the tip tree maintainer handbook directly from the relevant
   MAINTAINERS file entries (covering timers, IRQ, locking, scheduling,
   perf, x86, and others) so that contributors and tooling can know
   where to look

 - Enable interrupt remapping in defconfig, which is an architectural
   requirement for x2APIC to function correctly on bare metal. Without
   it, x2APIC was effectively enabled but non-functional.

 - Ensure that drivers which register custom restart handlers (such as
   those needed for SoC-based x86 devices like Intel Lightning Mountain)
   are actually invoked during reboot, bringing x86 in line with how
   other architectures handle this.

 - Cleanups

* tag 'x86_misc_for_v7.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Add references to tip tree handbook
  x86/64/defconfig: Add CONFIG_IRQ_REMAP
  x86/reboot: Execute the kernel restart handler upon machine restart
  x86/mtrr: Use kstrtoul() in parse_mtrr_spare_reg()
parents cd4cdc53 b21cf01c

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -6282,6 +6282,7 @@ M: Daniel Lezcano <daniel.lezcano@kernel.org> 
M:	Thomas Gleixner <tglx@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Supported

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

F:	Documentation/devicetree/bindings/timer/

F:	drivers/clocksource/
@@ -6667,6 +6668,7 @@ M: Thomas Gleixner <tglx@kernel.org> 
M:	Peter Zijlstra <peterz@infradead.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp/core

F:	include/linux/cpu.h

F:	include/linux/cpuhotplug.h
@@ -7095,6 +7097,7 @@ DEBUGOBJECTS: 
M:	Thomas Gleixner <tglx@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/debugobjects

F:	include/linux/debugobjects.h

F:	lib/debugobjects.c
@@ -10540,6 +10543,7 @@ R: Davidlohr Bueso <dave@stgolabs.net> 
R:	André Almeida <andrealmeid@igalia.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core

F:	Documentation/locking/*futex*

F:	include/asm-generic/futex.h
@@ -10681,6 +10685,7 @@ M: Peter Zijlstra <peterz@infradead.org> 
M:	Andy Lutomirski <luto@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/entry

F:	include/linux/entry-common.h

F:	include/linux/entry-virt.h
@@ -13523,6 +13528,7 @@ F: sound/soc/codecs/sma* 
IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Thomas Gleixner <tglx@kernel.org>

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	Documentation/core-api/irq/irq-domain.rst

F:	include/linux/irqdomain.h
@@ -13534,6 +13540,7 @@ IRQ SUBSYSTEM 
M:	Thomas Gleixner <tglx@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	include/linux/group_cpus.h

F:	include/linux/irq.h
@@ -13547,6 +13554,7 @@ IRQCHIP DRIVERS 
M:	Thomas Gleixner <tglx@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	Documentation/devicetree/bindings/interrupt-controller/

F:	drivers/irqchip/
@@ -14916,6 +14924,7 @@ M: Boqun Feng <boqun@kernel.org> (LOCKDEP & RUST) 
R:	Waiman Long <longman@redhat.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

P:	Documentation/process/maintainer-tip.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core

F:	Documentation/locking/

F:	arch/*/include/asm/spinlock*.h
@@ -19248,6 +19257,7 @@ OBJTOOL 
M:	Josh Poimboeuf <jpoimboe@kernel.org>

M:	Peter Zijlstra <peterz@infradead.org>

S:	Supported

P:	Documentation/process/maintainer-tip.rst

F:	include/linux/objtool*.h

F:	tools/objtool/








@@ -20716,6 +20726,7 @@ L:	linux-perf-users@vger.kernel.org







L:	linux-kernel@vger.kernel.org









S:	Supported









W:	https://perf.wiki.kernel.org/









P:	Documentation/process/maintainer-tip.rst









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-tools









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf-tools-next








@@ -21033,6 +21044,7 @@ M:	Frederic Weisbecker <frederic@kernel.org>







M:	Thomas Gleixner <tglx@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









P:	Documentation/process/maintainer-tip.rst









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core









F:	fs/timerfd.c









F:	include/linux/time_namespace.h








@@ -23713,6 +23725,7 @@ R:	Valentin Schneider <vschneid@redhat.com> (TOPOLOGY)







R:	K Prateek Nayak <kprateek.nayak@amd.com>









L:	linux-kernel@vger.kernel.org









S:	Maintained









P:	Documentation/process/maintainer-tip.rst









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core









F:	include/linux/preempt.h









F:	include/linux/sched.h








@@ -28613,6 +28626,7 @@ M:	x86@kernel.org







R:	"H. Peter Anvin" <hpa@zytor.com>









L:	linux-kernel@vger.kernel.org









S:	Maintained









P:	Documentation/process/maintainer-tip.rst









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core









F:	Documentation/arch/x86/









F:	Documentation/devicetree/bindings/x86/

























arch/x86/configs/x86_64_defconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -230,6 +230,7 @@ CONFIG_EEEPC_LAPTOP=y







CONFIG_AMD_IOMMU=y









CONFIG_INTEL_IOMMU=y









# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set









CONFIG_IRQ_REMAP=y









CONFIG_EXT4_FS=y









CONFIG_EXT4_FS_POSIX_ACL=y









CONFIG_EXT4_FS_SECURITY=y
































arch/x86/kernel/cpu/mtrr/cleanup.c



+4
−3






























Original line number
Diff line number
Diff line







@@ -437,9 +437,10 @@ static unsigned long nr_mtrr_spare_reg __initdata =

















static int __init parse_mtrr_spare_reg(char *arg)









{









	if (arg)









		nr_mtrr_spare_reg = simple_strtoul(arg, NULL, 0);









	return 0;









	if (!arg)









		return -EINVAL;



















	return kstrtoul(arg, 0, &nr_mtrr_spare_reg);









}









early_param("mtrr_spare_reg_nr", parse_mtrr_spare_reg);










































arch/x86/kernel/reboot.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -773,12 +773,15 @@ static void __machine_emergency_restart(int emergency)







	machine_ops.emergency_restart();









}



















static void native_machine_restart(char *__unused)









static void native_machine_restart(char *command)









{









	pr_notice("machine restart\n");



















	if (!reboot_force)









		machine_shutdown();



















	do_kernel_restart(command);



















	__machine_emergency_restart(0);









}