diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:28:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:28:28 +0200 |
| commit | d90dcc1f14555c62a32bc15c86c66d1d5444b5cb (patch) | |
| tree | dd3d7befcd7d9fcc484a8639dc5add1f213a40ca /arch/ia64 | |
| parent | Merge branch 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | efi/libstub/arm: Omit unneeded stripping of ksymtab/kcrctab sections (diff) | |
| download | linux-d90dcc1f14555c62a32bc15c86c66d1d5444b5cb.tar.xz linux-d90dcc1f14555c62a32bc15c86c66d1d5444b5cb.zip | |
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar:
"The changes in this cycle were:
- Squash a spurious warning when using the EFI framebuffer on a
non-EFI boot
- Use DMI data to annotate RAS memory errors on ARM just like we do
on Intel
- Followup cleanups for DMI
- libstub Makefile cleanups"
* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/libstub/arm: Omit unneeded stripping of ksymtab/kcrctab sections
efi: Unify DMI setup code over the arm/arm64, ia64 and x86 architectures
efi/arm: Show SMBIOS bank/device location in CPER and GHES error logs
efifb: Omit memory map check on legacy boot
efi/libstub: Refactor the cmd_stubcopy Makefile command
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 583a3746d70b..c9cfa760cd57 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -1058,9 +1058,7 @@ check_bugs (void) static int __init run_dmi_scan(void) { - dmi_scan_machine(); - dmi_memdev_walk(); - dmi_set_dump_stack_arch_desc(); + dmi_setup(); return 0; } core_initcall(run_dmi_scan); |