[x86] remove uses of magic macros for boot_params access

Instead of using magic macros for boot_params access, simply use the
boot_params structure.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 860e912a3fb..b1e45457d4e 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -288,8 +288,9 @@ unsigned long __init setup_memory(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
         /* Numa kva area is below the initrd */
-        if (LOADER_TYPE && INITRD_START)
-                kva_start_pfn = PFN_DOWN(INITRD_START)  - kva_pages;
+        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image)
+                kva_start_pfn = PFN_DOWN(boot_params.hdr.ramdisk_image)
+                        - kva_pages;
 #endif
         kva_start_pfn -= kva_start_pfn & (PTRS_PER_PTE-1);