diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 16:32:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 16:32:30 -0800 |
| commit | 6a9f70b0a5b3ca5db1dd5c7743ca555bfca2ae08 (patch) | |
| tree | 93f5ff596cf079ee4cc6d59c08728d72e542904f /arch/x86/kernel/setup.c | |
| parent | d6ec9d9a4def52a5094237564eaf6f6979fd7a27 (diff) | |
| parent | 6c3b56b1973083e2bb4e87eb90ea5368455706dc (diff) | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
"Three smaller changes:
- clang fix
- boot message beautification
- unnecessary header inclusion removal"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Disable Clang warnings about GNU extensions
x86/boot: Remove unnecessary #include <generated/utsrelease.h>
x86/boot: Spell out "boot CPU" for BP
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 507100a72eb3..07da46eab5ca 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1047,7 +1047,7 @@ void __init setup_arch(char **cmdline_p) /* * VMware detection requires dmi to be available, so this - * needs to be done after dmi_scan_machine, for the BP. + * needs to be done after dmi_scan_machine(), for the boot CPU. */ init_hypervisor_platform(); |