patch-2.3.45 linux/arch/ia64/kernel/efi.c

Next file: linux/arch/ia64/kernel/entry.S
Previous file: linux/arch/ia64/ia32/sys_ia32.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.44/linux/arch/ia64/kernel/efi.c linux/arch/ia64/kernel/efi.c
@@ -15,7 +15,6 @@
  *
  * Implemented EFI runtime services and virtual mode calls.  --davidm
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -166,14 +165,12 @@
 		      case EFI_BOOT_SERVICES_CODE:
 		      case EFI_BOOT_SERVICES_DATA:
 		      case EFI_CONVENTIONAL_MEMORY:
-#ifndef CONFIG_IA64_VIRTUAL_MEM_MAP
 			if (md->phys_addr > 1024*1024*1024UL) {
 				printk("Warning: ignoring %luMB of memory above 1GB!\n",
 				       md->num_pages >> 8);
 				md->type = EFI_UNUSABLE_MEMORY;
 				continue;
 			}
-#endif
 
 			curr.start = PAGE_OFFSET + md->phys_addr;
 			curr.end   = curr.start + (md->num_pages << 12);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)