mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 16:25:34 +00:00

Change signature of free_reserved_area() according to Russell King's suggestion to fix following build warnings: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:603:2: warning: passing argument 1 of 'free_reserved_area' makes integer from pointer without a cast [enabled by default] free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL); ^ In file included from include/linux/mman.h:4:0, from arch/arm/mm/init.c:15: include/linux/mm.h:1301:22: note: expected 'long unsigned int' but argument is of type 'void *' extern unsigned long free_reserved_area(unsigned long start, unsigned long end, mm/page_alloc.c: In function 'free_reserved_area': >> mm/page_alloc.c:5134:3: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast [enabled by default] In file included from arch/mips/include/asm/page.h:49:0, from include/linux/mmzone.h:20, from include/linux/gfp.h:4, from include/linux/mm.h:8, from mm/page_alloc.c:18: arch/mips/include/asm/io.h:119:29: note: expected 'const volatile void *' but argument is of type 'long unsigned int' mm/page_alloc.c: In function 'free_area_init_nodes': mm/page_alloc.c:5030:34: warning: array subscript is below array bounds [-Warray-bounds] Also address some minor code review comments. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Reported-by: Arnd Bergmann <arnd@arndb.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: <sworddragon2@aol.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: David Howells <dhowells@redhat.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Jianguo Wu <wujianguo@huawei.com> Cc: Joonsoo Kim <js1304@gmail.com> Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Michel Lespinasse <walken@google.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Rik van Riel <riel@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Tang Chen <tangchen@cn.fujitsu.com> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wen Congyang <wency@cn.fujitsu.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
148 lines
4.2 KiB
C
148 lines
4.2 KiB
C
/*
|
|
* Copyright 2004-2009 Analog Devices Inc.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <linux/gfp.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/export.h>
|
|
#include <asm/bfin-global.h>
|
|
#include <asm/pda.h>
|
|
#include <asm/cplbinit.h>
|
|
#include <asm/early_printk.h>
|
|
#include "blackfin_sram.h"
|
|
|
|
/*
|
|
* ZERO_PAGE is a special page that is used for zero-initialized data and COW.
|
|
* Let the bss do its zero-init magic so we don't have to do it ourselves.
|
|
*/
|
|
char empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
|
|
EXPORT_SYMBOL(empty_zero_page);
|
|
|
|
#ifndef CONFIG_EXCEPTION_L1_SCRATCH
|
|
#if defined CONFIG_SYSCALL_TAB_L1
|
|
__attribute__((l1_data))
|
|
#endif
|
|
static unsigned long exception_stack[NR_CPUS][1024];
|
|
#endif
|
|
|
|
struct blackfin_pda cpu_pda[NR_CPUS];
|
|
EXPORT_SYMBOL(cpu_pda);
|
|
|
|
/*
|
|
* paging_init() continues the virtual memory environment setup which
|
|
* was begun by the code in arch/head.S.
|
|
* The parameters are pointers to where to stick the starting and ending
|
|
* addresses of available kernel virtual memory.
|
|
*/
|
|
void __init paging_init(void)
|
|
{
|
|
/*
|
|
* make sure start_mem is page aligned, otherwise bootmem and
|
|
* page_alloc get different views of the world
|
|
*/
|
|
unsigned long end_mem = memory_end & PAGE_MASK;
|
|
|
|
unsigned long zones_size[MAX_NR_ZONES] = {
|
|
[0] = 0,
|
|
[ZONE_DMA] = (end_mem - CONFIG_PHY_RAM_BASE_ADDRESS) >> PAGE_SHIFT,
|
|
[ZONE_NORMAL] = 0,
|
|
#ifdef CONFIG_HIGHMEM
|
|
[ZONE_HIGHMEM] = 0,
|
|
#endif
|
|
};
|
|
|
|
/* Set up SFC/DFC registers (user data space) */
|
|
set_fs(KERNEL_DS);
|
|
|
|
pr_debug("free_area_init -> start_mem is %#lx virtual_end is %#lx\n",
|
|
PAGE_ALIGN(memory_start), end_mem);
|
|
free_area_init_node(0, zones_size,
|
|
CONFIG_PHY_RAM_BASE_ADDRESS >> PAGE_SHIFT, NULL);
|
|
}
|
|
|
|
asmlinkage void __init init_pda(void)
|
|
{
|
|
unsigned int cpu = raw_smp_processor_id();
|
|
|
|
early_shadow_stamp();
|
|
|
|
/* Initialize the PDA fields holding references to other parts
|
|
of the memory. The content of such memory is still
|
|
undefined at the time of the call, we are only setting up
|
|
valid pointers to it. */
|
|
memset(&cpu_pda[cpu], 0, sizeof(cpu_pda[cpu]));
|
|
|
|
#ifdef CONFIG_EXCEPTION_L1_SCRATCH
|
|
cpu_pda[cpu].ex_stack = (unsigned long *)(L1_SCRATCH_START + \
|
|
L1_SCRATCH_LENGTH);
|
|
#else
|
|
cpu_pda[cpu].ex_stack = exception_stack[cpu + 1];
|
|
#endif
|
|
|
|
#ifdef CONFIG_SMP
|
|
cpu_pda[cpu].imask = 0x1f;
|
|
#endif
|
|
}
|
|
|
|
void __init mem_init(void)
|
|
{
|
|
unsigned int codek = 0, datak = 0, initk = 0;
|
|
unsigned int reservedpages = 0, freepages = 0;
|
|
unsigned long tmp;
|
|
unsigned long start_mem = memory_start;
|
|
unsigned long end_mem = memory_end;
|
|
|
|
end_mem &= PAGE_MASK;
|
|
high_memory = (void *)end_mem;
|
|
|
|
start_mem = PAGE_ALIGN(start_mem);
|
|
max_mapnr = num_physpages = MAP_NR(high_memory);
|
|
printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);
|
|
|
|
/* This will put all low memory onto the freelists. */
|
|
totalram_pages = free_all_bootmem();
|
|
|
|
reservedpages = 0;
|
|
for (tmp = ARCH_PFN_OFFSET; tmp < max_mapnr; tmp++)
|
|
if (PageReserved(pfn_to_page(tmp)))
|
|
reservedpages++;
|
|
freepages = max_mapnr - ARCH_PFN_OFFSET - reservedpages;
|
|
|
|
/* do not count in kernel image between _rambase and _ramstart */
|
|
reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
|
|
#if (defined(CONFIG_BFIN_EXTMEM_ICACHEABLE) && ANOMALY_05000263)
|
|
reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >> PAGE_SHIFT;
|
|
#endif
|
|
|
|
codek = (_etext - _stext) >> 10;
|
|
initk = (__init_end - __init_begin) >> 10;
|
|
datak = ((_ramstart - _rambase) >> 10) - codek - initk;
|
|
|
|
printk(KERN_INFO
|
|
"Memory available: %luk/%luk RAM, "
|
|
"(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
|
|
(unsigned long) freepages << (PAGE_SHIFT-10), (_ramend - CONFIG_PHY_RAM_BASE_ADDRESS) >> 10,
|
|
initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
|
|
}
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
void __init free_initrd_mem(unsigned long start, unsigned long end)
|
|
{
|
|
#ifndef CONFIG_MPU
|
|
free_reserved_area((void *)start, (void *)end, 0, "initrd");
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
void __init_refok free_initmem(void)
|
|
{
|
|
#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
|
|
free_initmem_default(0);
|
|
if (memory_start == (unsigned long)(&__init_end))
|
|
memory_start = (unsigned long)(&__init_begin);
|
|
#endif
|
|
}
|