diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 10:21:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 10:21:58 -0700 |
| commit | 75f500204c645787c27d6085d39291946c928e02 (patch) | |
| tree | e0218f75d9ab5911a2339b6c9f7e4e21aaeaae1d /arch | |
| parent | 42e7b09e688bf86c032ca36ddb65cc548bb6147f (diff) | |
| parent | d3758f87f39c5b072dde74c55bfb988262a3a45c (diff) | |
| download | linux-75f500204c645787c27d6085d39291946c928e02.tar.gz linux-75f500204c645787c27d6085d39291946c928e02.tar.bz2 linux-75f500204c645787c27d6085d39291946c928e02.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 5 | ||||
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index d45f215bc8fc..51b75cea7018 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -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: diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index c27d5b2c182b..de636b215677 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -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(); } |