| mm.c (e37c83c06c2690157a989df40dc99a6b61c9ea15) | mm.c (95f72d1ed41a66f1c1c29c24d479de81a0bea36f) |
|---|---|
| 1/* 2 * PS3 address space management. 3 * 4 * Copyright (C) 2006 Sony Computer Entertainment Inc. 5 * Copyright 2006 Sony Corp. 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by --- 7 unchanged lines hidden (view full) --- 16 * You should have received a copy of the GNU General Public License 17 * along with this program; if not, write to the Free Software 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 */ 20 21#include <linux/kernel.h> 22#include <linux/module.h> 23#include <linux/memory_hotplug.h> | 1/* 2 * PS3 address space management. 3 * 4 * Copyright (C) 2006 Sony Computer Entertainment Inc. 5 * Copyright 2006 Sony Corp. 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by --- 7 unchanged lines hidden (view full) --- 16 * You should have received a copy of the GNU General Public License 17 * along with this program; if not, write to the Free Software 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 */ 20 21#include <linux/kernel.h> 22#include <linux/module.h> 23#include <linux/memory_hotplug.h> |
| 24#include <linux/lmb.h> | 24#include <linux/memblock.h> |
| 25#include <linux/slab.h> 26 27#include <asm/cell-regs.h> 28#include <asm/firmware.h> 29#include <asm/prom.h> 30#include <asm/udbg.h> 31#include <asm/lv1call.h> 32 --- 280 unchanged lines hidden (view full) --- 313 result = add_memory(0, start_addr, map.r1.size); 314 315 if (result) { 316 pr_err("%s:%d: add_memory failed: (%d)\n", 317 __func__, __LINE__, result); 318 return result; 319 } 320 | 25#include <linux/slab.h> 26 27#include <asm/cell-regs.h> 28#include <asm/firmware.h> 29#include <asm/prom.h> 30#include <asm/udbg.h> 31#include <asm/lv1call.h> 32 --- 280 unchanged lines hidden (view full) --- 313 result = add_memory(0, start_addr, map.r1.size); 314 315 if (result) { 316 pr_err("%s:%d: add_memory failed: (%d)\n", 317 __func__, __LINE__, result); 318 return result; 319 } 320 |
| 321 lmb_add(start_addr, map.r1.size); 322 lmb_analyze(); | 321 memblock_add(start_addr, map.r1.size); 322 memblock_analyze(); |
| 323 324 result = online_pages(start_pfn, nr_pages); 325 326 if (result) 327 pr_err("%s:%d: online_pages failed: (%d)\n", 328 __func__, __LINE__, result); 329 330 return result; --- 907 unchanged lines hidden --- | 323 324 result = online_pages(start_pfn, nr_pages); 325 326 if (result) 327 pr_err("%s:%d: online_pages failed: (%d)\n", 328 __func__, __LINE__, result); 329 330 return result; --- 907 unchanged lines hidden --- |