diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/setup_64.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 5b0bffb7fcc9..4ef91749959e 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/efi.h> | 39 | #include <linux/efi.h> |
40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
41 | #include <linux/edd.h> | 41 | #include <linux/edd.h> |
42 | #include <linux/iscsi_ibft.h> | ||
42 | #include <linux/nodemask.h> | 43 | #include <linux/nodemask.h> |
43 | #include <linux/kexec.h> | 44 | #include <linux/kexec.h> |
44 | #include <linux/crash_dump.h> | 45 | #include <linux/crash_dump.h> |
@@ -689,6 +690,8 @@ void __init setup_bootmem_allocator(void) | |||
689 | #endif | 690 | #endif |
690 | numa_kva_reserve(); | 691 | numa_kva_reserve(); |
691 | reserve_crashkernel(); | 692 | reserve_crashkernel(); |
693 | |||
694 | reserve_ibft_region(); | ||
692 | } | 695 | } |
693 | 696 | ||
694 | /* | 697 | /* |
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 674ef3510cdf..216c93bd9993 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/acpi.h> | 33 | #include <linux/acpi.h> |
34 | #include <linux/kallsyms.h> | 34 | #include <linux/kallsyms.h> |
35 | #include <linux/edd.h> | 35 | #include <linux/edd.h> |
36 | #include <linux/iscsi_ibft.h> | ||
36 | #include <linux/mmzone.h> | 37 | #include <linux/mmzone.h> |
37 | #include <linux/kexec.h> | 38 | #include <linux/kexec.h> |
38 | #include <linux/cpufreq.h> | 39 | #include <linux/cpufreq.h> |
@@ -434,6 +435,9 @@ void __init setup_arch(char **cmdline_p) | |||
434 | } | 435 | } |
435 | #endif | 436 | #endif |
436 | reserve_crashkernel(); | 437 | reserve_crashkernel(); |
438 | |||
439 | reserve_ibft_region(); | ||
440 | |||
437 | paging_init(); | 441 | paging_init(); |
438 | map_vsyscall(); | 442 | map_vsyscall(); |
439 | 443 | ||