Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 1 | /* |
| 2 | * linux/arch/sh/mm/init.c |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 3 | * |
| 4 | * Copyright (C) 1999 Niibe Yutaka |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 5 | * Copyright (C) 2002 - 2007 Paul Mundt |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 6 | * |
| 7 | * Based on linux/arch/i386/mm/init.c: |
| 8 | * Copyright (C) 1995 Linus Torvalds |
| 9 | */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 10 | #include <linux/mm.h> |
| 11 | #include <linux/swap.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 12 | #include <linux/init.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 13 | #include <linux/bootmem.h> |
Paul Mundt | 2cb7ce3 | 2006-09-27 18:20:58 +0900 | [diff] [blame] | 14 | #include <linux/proc_fs.h> |
Paul Mundt | 27641de | 2007-05-14 10:48:01 +0900 | [diff] [blame] | 15 | #include <linux/pagemap.h> |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 16 | #include <linux/percpu.h> |
| 17 | #include <linux/io.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 18 | #include <asm/mmu_context.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 19 | #include <asm/tlb.h> |
| 20 | #include <asm/cacheflush.h> |
Paul Mundt | 07cbb41 | 2007-06-06 12:23:06 +0900 | [diff] [blame] | 21 | #include <asm/sections.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 22 | #include <asm/cache.h> |
| 23 | |
| 24 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 25 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
Stuart Menefy | c6feb61 | 2008-09-05 16:06:42 +0900 | [diff] [blame] | 26 | |
| 27 | #ifdef CONFIG_SUPERH32 |
| 28 | /* |
| 29 | * Handle trivial transitions between cached and uncached |
| 30 | * segments, making use of the 1:1 mapping relationship in |
| 31 | * 512MB lowmem. |
| 32 | * |
| 33 | * This is the offset of the uncached section from its cached alias. |
| 34 | * Default value only valid in 29 bit mode, in 32bit mode will be |
| 35 | * overridden in pmb_init. |
| 36 | */ |
| 37 | unsigned long cached_to_uncached = P2SEG - P1SEG; |
| 38 | #endif |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 39 | |
Yoshinori Sato | 11cbb70 | 2006-12-07 18:07:27 +0900 | [diff] [blame] | 40 | #ifdef CONFIG_MMU |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 41 | static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot) |
| 42 | { |
| 43 | pgd_t *pgd; |
Paul Mundt | 26ff6c1 | 2006-09-27 15:13:36 +0900 | [diff] [blame] | 44 | pud_t *pud; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 45 | pmd_t *pmd; |
| 46 | pte_t *pte; |
| 47 | |
Stuart Menefy | 99a596f | 2006-11-21 15:38:05 +0900 | [diff] [blame] | 48 | pgd = pgd_offset_k(addr); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 49 | if (pgd_none(*pgd)) { |
| 50 | pgd_ERROR(*pgd); |
| 51 | return; |
| 52 | } |
| 53 | |
Stuart Menefy | 99a596f | 2006-11-21 15:38:05 +0900 | [diff] [blame] | 54 | pud = pud_alloc(NULL, pgd, addr); |
| 55 | if (unlikely(!pud)) { |
| 56 | pud_ERROR(*pud); |
| 57 | return; |
Paul Mundt | 26ff6c1 | 2006-09-27 15:13:36 +0900 | [diff] [blame] | 58 | } |
| 59 | |
Stuart Menefy | 99a596f | 2006-11-21 15:38:05 +0900 | [diff] [blame] | 60 | pmd = pmd_alloc(NULL, pud, addr); |
| 61 | if (unlikely(!pmd)) { |
| 62 | pmd_ERROR(*pmd); |
| 63 | return; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 64 | } |
| 65 | |
| 66 | pte = pte_offset_kernel(pmd, addr); |
| 67 | if (!pte_none(*pte)) { |
| 68 | pte_ERROR(*pte); |
| 69 | return; |
| 70 | } |
| 71 | |
| 72 | set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, prot)); |
Paul Mundt | 997d003 | 2009-06-19 15:37:11 +0900 | [diff] [blame] | 73 | local_flush_tlb_one(get_asid(), addr); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 74 | } |
| 75 | |
| 76 | /* |
| 77 | * As a performance optimization, other platforms preserve the fixmap mapping |
| 78 | * across a context switch, we don't presently do this, but this could be done |
| 79 | * in a similar fashion as to the wired TLB interface that sh64 uses (by way |
Simon Arlott | e868d61 | 2007-05-14 08:15:10 +0900 | [diff] [blame] | 80 | * of the memory mapped UTLB configuration) -- this unfortunately forces us to |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 81 | * give up a TLB entry for each mapping we want to preserve. While this may be |
| 82 | * viable for a small number of fixmaps, it's not particularly useful for |
| 83 | * everything and needs to be carefully evaluated. (ie, we may want this for |
| 84 | * the vsyscall page). |
| 85 | * |
| 86 | * XXX: Perhaps add a _PAGE_WIRED flag or something similar that we can pass |
| 87 | * in at __set_fixmap() time to determine the appropriate behavior to follow. |
| 88 | * |
| 89 | * -- PFM. |
| 90 | */ |
| 91 | void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) |
| 92 | { |
| 93 | unsigned long address = __fix_to_virt(idx); |
| 94 | |
| 95 | if (idx >= __end_of_fixed_addresses) { |
| 96 | BUG(); |
| 97 | return; |
| 98 | } |
| 99 | |
| 100 | set_pte_phys(address, phys, prot); |
| 101 | } |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 102 | |
| 103 | void __init page_table_range_init(unsigned long start, unsigned long end, |
| 104 | pgd_t *pgd_base) |
| 105 | { |
| 106 | pgd_t *pgd; |
| 107 | pud_t *pud; |
| 108 | pmd_t *pmd; |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 109 | pte_t *pte; |
| 110 | int i, j, k; |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 111 | unsigned long vaddr; |
| 112 | |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 113 | vaddr = start; |
| 114 | i = __pgd_offset(vaddr); |
| 115 | j = __pud_offset(vaddr); |
| 116 | k = __pmd_offset(vaddr); |
| 117 | pgd = pgd_base + i; |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 118 | |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 119 | for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) { |
| 120 | pud = (pud_t *)pgd; |
| 121 | for ( ; (j < PTRS_PER_PUD) && (vaddr != end); pud++, j++) { |
| 122 | pmd = (pmd_t *)pud; |
| 123 | for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) { |
| 124 | if (pmd_none(*pmd)) { |
| 125 | pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); |
| 126 | pmd_populate_kernel(&init_mm, pmd, pte); |
| 127 | BUG_ON(pte != pte_offset_kernel(pmd, 0)); |
| 128 | } |
| 129 | vaddr += PMD_SIZE; |
| 130 | } |
| 131 | k = 0; |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 132 | } |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 133 | j = 0; |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 134 | } |
| 135 | } |
Yoshinori Sato | 11cbb70 | 2006-12-07 18:07:27 +0900 | [diff] [blame] | 136 | #endif /* CONFIG_MMU */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 137 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 138 | /* |
| 139 | * paging_init() sets up the page tables |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 140 | */ |
| 141 | void __init paging_init(void) |
| 142 | { |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 143 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 144 | unsigned long vaddr, end; |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 145 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 146 | |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 147 | /* We don't need to map the kernel through the TLB, as |
| 148 | * it is permanatly mapped using P1. So clear the |
| 149 | * entire pgd. */ |
| 150 | memset(swapper_pg_dir, 0, sizeof(swapper_pg_dir)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 151 | |
Stuart Menefy | 6e4662f | 2006-11-21 13:53:44 +0900 | [diff] [blame] | 152 | /* Set an initial value for the MMU.TTB so we don't have to |
| 153 | * check for a null value. */ |
| 154 | set_TTB(swapper_pg_dir); |
| 155 | |
Paul Mundt | acca4f4 | 2008-11-10 20:00:45 +0900 | [diff] [blame] | 156 | /* |
| 157 | * Populate the relevant portions of swapper_pg_dir so that |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 158 | * we can use the fixmap entries without calling kmalloc. |
Paul Mundt | acca4f4 | 2008-11-10 20:00:45 +0900 | [diff] [blame] | 159 | * pte's will be filled in by __set_fixmap(). |
| 160 | */ |
| 161 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; |
Paul Mundt | 0906a3a | 2009-09-03 17:21:10 +0900 | [diff] [blame] | 162 | end = (FIXADDR_TOP + PMD_SIZE - 1) & PMD_MASK; |
| 163 | page_table_range_init(vaddr, end, swapper_pg_dir); |
Paul Mundt | acca4f4 | 2008-11-10 20:00:45 +0900 | [diff] [blame] | 164 | |
| 165 | kmap_coherent_init(); |
Stuart Menefy | 2adb4e1 | 2007-11-30 17:59:55 +0900 | [diff] [blame] | 166 | |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 167 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |
| 168 | |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 169 | for_each_online_node(nid) { |
| 170 | pg_data_t *pgdat = NODE_DATA(nid); |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 171 | unsigned long low, start_pfn; |
| 172 | |
Johannes Weiner | 3560e24 | 2008-07-23 21:28:09 -0700 | [diff] [blame] | 173 | start_pfn = pgdat->bdata->node_min_pfn; |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 174 | low = pgdat->bdata->node_low_pfn; |
| 175 | |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 176 | if (max_zone_pfns[ZONE_NORMAL] < low) |
| 177 | max_zone_pfns[ZONE_NORMAL] = low; |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 178 | |
| 179 | printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n", |
| 180 | nid, start_pfn, low); |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 181 | } |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 182 | |
| 183 | free_area_init_nodes(max_zone_pfns); |
Stuart Menefy | cbaa118 | 2007-11-30 17:06:36 +0900 | [diff] [blame] | 184 | |
| 185 | /* Set up the uncached fixmap */ |
| 186 | set_fixmap_nocache(FIX_UNCACHED, __pa(&__uncached_start)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 187 | } |
| 188 | |
| 189 | void __init mem_init(void) |
| 190 | { |
Paul Mundt | dfbb904 | 2007-05-23 17:48:36 +0900 | [diff] [blame] | 191 | int codesize, datasize, initsize; |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 192 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 193 | |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 194 | num_physpages = 0; |
| 195 | high_memory = NULL; |
| 196 | |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 197 | for_each_online_node(nid) { |
| 198 | pg_data_t *pgdat = NODE_DATA(nid); |
| 199 | unsigned long node_pages = 0; |
| 200 | void *node_high_memory; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 201 | |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 202 | num_physpages += pgdat->node_present_pages; |
| 203 | |
| 204 | if (pgdat->node_spanned_pages) |
| 205 | node_pages = free_all_bootmem_node(pgdat); |
| 206 | |
| 207 | totalram_pages += node_pages; |
| 208 | |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 209 | node_high_memory = (void *)__va((pgdat->node_start_pfn + |
| 210 | pgdat->node_spanned_pages) << |
| 211 | PAGE_SHIFT); |
Paul Mundt | 0106662 | 2007-03-28 16:38:13 +0900 | [diff] [blame] | 212 | if (node_high_memory > high_memory) |
| 213 | high_memory = node_high_memory; |
| 214 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 215 | |
Paul Mundt | 37443ef | 2009-08-15 12:29:49 +0900 | [diff] [blame] | 216 | /* Set this up early, so we can take care of the zero page */ |
| 217 | cpu_cache_init(); |
| 218 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 219 | /* clear the zero-page */ |
| 220 | memset(empty_zero_page, 0, PAGE_SIZE); |
| 221 | __flush_wback_region(empty_zero_page, PAGE_SIZE); |
| 222 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 223 | codesize = (unsigned long) &_etext - (unsigned long) &_text; |
| 224 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; |
| 225 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |
| 226 | |
Paul Mundt | 2cb7ce3 | 2006-09-27 18:20:58 +0900 | [diff] [blame] | 227 | printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " |
Paul Mundt | dfbb904 | 2007-05-23 17:48:36 +0900 | [diff] [blame] | 228 | "%dk data, %dk init)\n", |
Geert Uytterhoeven | cc013a8 | 2009-09-21 17:02:36 -0700 | [diff] [blame] | 229 | nr_free_pages() << (PAGE_SHIFT-10), |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 230 | num_physpages << (PAGE_SHIFT-10), |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 231 | codesize >> 10, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 232 | datasize >> 10, |
| 233 | initsize >> 10); |
| 234 | |
Paul Mundt | 19f9a34 | 2006-09-27 18:33:49 +0900 | [diff] [blame] | 235 | /* Initialize the vDSO */ |
| 236 | vsyscall_init(); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 237 | } |
| 238 | |
| 239 | void free_initmem(void) |
| 240 | { |
| 241 | unsigned long addr; |
Paul Mundt | 65463b7 | 2005-11-07 00:58:24 -0800 | [diff] [blame] | 242 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 243 | addr = (unsigned long)(&__init_begin); |
| 244 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { |
| 245 | ClearPageReserved(virt_to_page(addr)); |
Nick Piggin | 7835e98 | 2006-03-22 00:08:40 -0800 | [diff] [blame] | 246 | init_page_count(virt_to_page(addr)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 247 | free_page(addr); |
| 248 | totalram_pages++; |
| 249 | } |
Paul Mundt | 07cbb41 | 2007-06-06 12:23:06 +0900 | [diff] [blame] | 250 | printk("Freeing unused kernel memory: %ldk freed\n", |
| 251 | ((unsigned long)&__init_end - |
| 252 | (unsigned long)&__init_begin) >> 10); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 253 | } |
| 254 | |
| 255 | #ifdef CONFIG_BLK_DEV_INITRD |
| 256 | void free_initrd_mem(unsigned long start, unsigned long end) |
| 257 | { |
| 258 | unsigned long p; |
| 259 | for (p = start; p < end; p += PAGE_SIZE) { |
| 260 | ClearPageReserved(virt_to_page(p)); |
Nick Piggin | 7835e98 | 2006-03-22 00:08:40 -0800 | [diff] [blame] | 261 | init_page_count(virt_to_page(p)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 262 | free_page(p); |
| 263 | totalram_pages++; |
| 264 | } |
Paul Mundt | 2de212e | 2007-06-06 12:09:54 +0900 | [diff] [blame] | 265 | printk("Freeing initrd memory: %ldk freed\n", (end - start) >> 10); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 266 | } |
| 267 | #endif |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 268 | |
Paul Mundt | c15c5f8 | 2008-09-20 20:21:33 +0900 | [diff] [blame] | 269 | #if THREAD_SHIFT < PAGE_SHIFT |
| 270 | static struct kmem_cache *thread_info_cache; |
| 271 | |
| 272 | struct thread_info *alloc_thread_info(struct task_struct *tsk) |
| 273 | { |
| 274 | struct thread_info *ti; |
| 275 | |
| 276 | ti = kmem_cache_alloc(thread_info_cache, GFP_KERNEL); |
| 277 | if (unlikely(ti == NULL)) |
| 278 | return NULL; |
| 279 | #ifdef CONFIG_DEBUG_STACK_USAGE |
| 280 | memset(ti, 0, THREAD_SIZE); |
| 281 | #endif |
| 282 | return ti; |
| 283 | } |
| 284 | |
| 285 | void free_thread_info(struct thread_info *ti) |
| 286 | { |
| 287 | kmem_cache_free(thread_info_cache, ti); |
| 288 | } |
| 289 | |
| 290 | void thread_info_cache_init(void) |
| 291 | { |
| 292 | thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE, |
| 293 | THREAD_SIZE, 0, NULL); |
| 294 | BUG_ON(thread_info_cache == NULL); |
| 295 | } |
| 296 | #endif /* THREAD_SHIFT < PAGE_SHIFT */ |
| 297 | |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 298 | #ifdef CONFIG_MEMORY_HOTPLUG |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 299 | int arch_add_memory(int nid, u64 start, u64 size) |
| 300 | { |
| 301 | pg_data_t *pgdat; |
| 302 | unsigned long start_pfn = start >> PAGE_SHIFT; |
| 303 | unsigned long nr_pages = size >> PAGE_SHIFT; |
| 304 | int ret; |
| 305 | |
| 306 | pgdat = NODE_DATA(nid); |
| 307 | |
| 308 | /* We only have ZONE_NORMAL, so this is easy.. */ |
Gary Hade | c04fc58 | 2009-01-06 14:39:14 -0800 | [diff] [blame] | 309 | ret = __add_pages(nid, pgdat->node_zones + ZONE_NORMAL, |
| 310 | start_pfn, nr_pages); |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 311 | if (unlikely(ret)) |
Harvey Harrison | 866e6b9 | 2008-03-04 15:23:47 -0800 | [diff] [blame] | 312 | printk("%s: Failed, __add_pages() == %d\n", __func__, ret); |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 313 | |
| 314 | return ret; |
| 315 | } |
| 316 | EXPORT_SYMBOL_GPL(arch_add_memory); |
| 317 | |
Paul Mundt | 357d594 | 2007-06-11 15:32:07 +0900 | [diff] [blame] | 318 | #ifdef CONFIG_NUMA |
Paul Mundt | 33d63bd | 2007-06-07 11:32:52 +0900 | [diff] [blame] | 319 | int memory_add_physaddr_to_nid(u64 addr) |
| 320 | { |
| 321 | /* Node 0 for now.. */ |
| 322 | return 0; |
| 323 | } |
| 324 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
| 325 | #endif |
Paul Mundt | 3159e7d | 2008-09-05 15:39:12 +0900 | [diff] [blame] | 326 | #endif /* CONFIG_MEMORY_HOTPLUG */ |