Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

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);
 

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