Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] kexec fails on systems with blocks of uncached memory [IA64] Ski simulator doesn't need check_sal_cache_flush
This commit is contained in:
commit
75f500204c
|
@ -1232,9 +1232,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
|
|||
if (md->attribute & EFI_MEMORY_WP) {
|
||||
name = "System ROM";
|
||||
flags |= IORESOURCE_READONLY;
|
||||
} else {
|
||||
} else if (md->attribute == EFI_MEMORY_UC)
|
||||
name = "Uncached RAM";
|
||||
else
|
||||
name = "System RAM";
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_ACPI_MEMORY_NVS:
|
||||
|
|
|
@ -616,7 +616,9 @@ setup_arch (char **cmdline_p)
|
|||
ia64_mca_init();
|
||||
|
||||
platform_setup(cmdline_p);
|
||||
#ifndef CONFIG_IA64_HP_SIM
|
||||
check_sal_cache_flush();
|
||||
#endif
|
||||
paging_init();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue