git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
frv
/
mm
/
init.c
diff --git
a/arch/frv/mm/init.c
b/arch/frv/mm/init.c
index
b5b4286
..
b841ecf
100644
(file)
--- a/
arch/frv/mm/init.c
+++ b/
arch/frv/mm/init.c
@@
-98,7
+98,7
@@
void show_mem(void)
*/
void __init paging_init(void)
{
*/
void __init paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0,
0, 0
};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
/* allocate some pages for kernel housekeeping tasks */
empty_bad_page_table = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
/* allocate some pages for kernel housekeeping tasks */
empty_bad_page_table = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
@@
-126,8
+126,7
@@
void __init paging_init(void)
/* distribute the allocatable pages across the various zones and pass them to the allocator
*/
/* distribute the allocatable pages across the various zones and pass them to the allocator
*/
- zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;
- zones_size[ZONE_NORMAL] = 0;
+ zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
#ifdef CONFIG_HIGHMEM
zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
#endif
#ifdef CONFIG_HIGHMEM
zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
#endif
@@
-198,7
+197,7
@@
void __init mem_init(void)
/*
* free the memory that was only required for initialisation
*/
/*
* free the memory that was only required for initialisation
*/
-void
__init
free_initmem(void)
+void free_initmem(void)
{
#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
unsigned long start, end, addr;
{
#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
unsigned long start, end, addr;