diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-09-22 18:02:49 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-09-22 18:12:37 +0100 |
| commit | 6f325eaa86f167f8c1e1ffa288dfb991248a6ac7 (patch) | |
| tree | c143951b99328ce6a621d635747df41a1acb4705 /arch/arm64/kernel | |
| parent | 2189064795dc3fb4101e5c34d28c6b62b8a3bfd9 (diff) | |
| download | linux-6f325eaa86f167f8c1e1ffa288dfb991248a6ac7.tar.bz2 | |
Revert "arm64: dmi: Add SMBIOS/DMI support"
This reverts commit 668ebd106860f09f43993517f786a2ddfd0f9ebe.
... because of lots of warnings during boot if Linux isn't started as an EFI
application:
WARNING: CPU: 4 PID: 1 at
/work/Linux/linux-2.6-aarch64/drivers/firmware/dmi_scan.c:591 dmi_matches+0x10c/0x110()
dmi check: not initialized yet.
Modules linked in:
CPU: 4 PID: 1 Comm: swapper/0 Not tainted 3.17.0-rc4+ #606
Call trace:
[<ffffffc000087fb0>] dump_backtrace+0x0/0x124
[<ffffffc0000880e4>] show_stack+0x10/0x1c
[<ffffffc0004d58f8>] dump_stack+0x74/0xb8
[<ffffffc0000ab640>] warn_slowpath_common+0x8c/0xb4
[<ffffffc0000ab6b4>] warn_slowpath_fmt+0x4c/0x58
[<ffffffc0003f2d7c>] dmi_matches+0x108/0x110
[<ffffffc0003f2da8>] dmi_check_system+0x24/0x68
[<ffffffc0006974c4>] atkbd_init+0x10/0x34
[<ffffffc0000814ac>] do_one_initcall+0x88/0x1a0
[<ffffffc00067aab4>] kernel_init_freeable+0x148/0x1e8
[<ffffffc0004d2c64>] kernel_init+0x10/0xd4
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/efi.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index b71ab0e5780c..03aaa99e1ea0 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -11,7 +11,6 @@ * */ -#include <linux/dmi.h> #include <linux/efi.h> #include <linux/export.h> #include <linux/memblock.h> @@ -436,13 +435,6 @@ static int __init arm64_enter_virtual_mode(void) } set_bit(EFI_SYSTEM_TABLES, &efi.flags); - /* - * DMI depends on EFI on arm64, and dmi_scan_machine() needs to be - * called early because dmi_id_init(), which is an arch_initcall itself, - * depends on dmi_scan_machine() having been called already. - */ - dmi_scan_machine(); - local_irq_save(flags); cpu_switch_mm(idmap_pg_dir, &init_mm); |