Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / arch / arc / mm / init.c

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index 8c9415ed62804d0a8b4a35df176f1b43e6c1be44..ba145065c579bfff5af1d0ca4e569a8b8c49da32 100644 (file)
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -26,7 +26,7 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __aligned(PAGE_SIZE);
 char empty_zero_page[PAGE_SIZE] __aligned(PAGE_SIZE);
 EXPORT_SYMBOL(empty_zero_page);
 
-static const unsigned long low_mem_start = CONFIG_LINUX_LINK_BASE;
+static const unsigned long low_mem_start = CONFIG_LINUX_RAM_BASE;
 static unsigned long low_mem_sz;
 
 #ifdef CONFIG_HIGHMEM
@@ -63,7 +63,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 
        if (!low_mem_sz) {
                if (base != low_mem_start)
-                       panic("CONFIG_LINUX_LINK_BASE != DT memory { }");
+                       panic("CONFIG_LINUX_RAM_BASE != DT memory { }");
 
                low_mem_sz = size;
                in_use = 1;
@@ -161,7 +161,7 @@ void __init setup_arch_memory(void)
         * We can't use the helper free_area_init(zones[]) because it uses
         * PAGE_OFFSET to compute the @min_low_pfn which would be wrong
         * when our kernel doesn't start at PAGE_OFFSET, i.e.
-        * PAGE_OFFSET != CONFIG_LINUX_LINK_BASE
+        * PAGE_OFFSET != CONFIG_LINUX_RAM_BASE
         */
        free_area_init_node(0,                  /* node-id */
                            zones_size,         /* num pages per zone */