From 318f07633bf9e6979062ecd645bea33ed32891af Mon Sep 17 00:00:00 2001 From: David Mosberger Date: Fri, 25 Jul 2003 10:21:39 -0700 Subject: [PATCH] ia64: Two small fixes to make ia64 build & work again. --- arch/ia64/kernel/setup.c | 3 +-- include/asm-ia64/io.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 9ecbc11e84ffa..86b2ce3594ab5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -372,6 +372,7 @@ setup_arch (char **cmdline_p) strlcpy(saved_command_line, *cmdline_p, sizeof(saved_command_line)); efi_init(); + find_memory(); #ifdef CONFIG_ACPI_BOOT /* Initialize the ACPI boot-time table parser */ @@ -385,8 +386,6 @@ setup_arch (char **cmdline_p) # endif #endif /* CONFIG_APCI_BOOT */ - find_memory(); - /* process SAL system table: */ ia64_sal_init(efi.sal_systab); diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h index 2ff2d00ef3ed1..1297c6bba42b9 100644 --- a/include/asm-ia64/io.h +++ b/include/asm-ia64/io.h @@ -420,6 +420,7 @@ extern void __ia64_memset_c_io (unsigned long, unsigned long, long); * SPECweb-like workloads on zx1-based machines. Thus, for now we favor I/O MMU bypassing * over BIO-level virtual merging. */ +extern unsigned long ia64_max_iommu_merge_mask; #if 1 #define BIO_VMERGE_BOUNDARY 0 #else @@ -433,7 +434,6 @@ extern void __ia64_memset_c_io (unsigned long, unsigned long, long); * * which is precisely what we want. */ -extern unsigned long ia64_max_iommu_merge_mask; #define BIO_VMERGE_BOUNDARY (ia64_max_iommu_merge_mask + 1) #endif -- 2.53.0