Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35581
b: refs/heads/master
c: f06a968
h: refs/heads/master
i:
  35579: c363d7d
v: v3
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Sep 26, 2006
1 parent c2effb4 commit 437dbbb
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 776ed98b842ee8551793f842fe028c8091f3633e
refs/heads/master: f06a96844a577c43249fce25809a4fae07407f46
2 changes: 1 addition & 1 deletion trunk/arch/alpha/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ callback_init(void * kernel_end)
void
paging_init(void)
{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long dma_pfn, high_pfn;

dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/frv/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void show_mem(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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/h8300/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void paging_init(void)
#endif

{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };

zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/i386/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ static unsigned long __init setup_memory(void)

void __init zone_sizes_init(void)
{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = { 0, };
unsigned int max_dma, low;

max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/i386/mm/discontig.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ void __init zone_sizes_init(void)


for_each_online_node(nid) {
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long *zholes_size;
unsigned int max_dma;

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m32r/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void free_initrd_mem(unsigned long, unsigned long);
#ifndef CONFIG_DISCONTIGMEM
unsigned long __init zone_sizes_init(void)
{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long max_dma;
unsigned long low;
unsigned long start_pfn;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/m68knommu/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void paging_init(void)
#endif

{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };

zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/mips/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ static int __init page_is_ram(unsigned long pagenr)

void __init paging_init(void)
{
unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
unsigned long zones_size[] = { 0, };
unsigned long max_dma, high, low;
#ifndef CONFIG_FLATMEM
unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
unsigned long zholes_size[] = { 0, };
unsigned long i, j, pfn;
#endif

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/sgi-ip27/ip27-memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ extern unsigned long setup_zero_pages(void);

void __init paging_init(void)
{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned node;

pagetable_init();
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/parisc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ void __init paging_init(void)
flush_tlb_all_local(NULL);

for (i = 0; i < npmem_ranges; i++) {
unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 };
unsigned long zones_size[MAX_NR_ZONES] = { 0, };

/* We have an IOMMU, so all memory can go into a single
ZONE_DMA zone. */
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh64/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void show_mem(void)
*/
void __init paging_init(void)
{
unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
unsigned long zones_size[MAX_NR_ZONES] = {0, };

pgd_init((unsigned long)swapper_pg_dir);
pgd_init((unsigned long)swapper_pg_dir +
Expand Down

0 comments on commit 437dbbb

Please sign in to comment.