diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/alpha/mm/init.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/alpha/mm/init.c')
| -rw-r--r-- | arch/alpha/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 917dad1b74c8..550f4907d613 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c | |||
| @@ -270,7 +270,7 @@ callback_init(void * kernel_end) | |||
| 270 | void | 270 | void |
| 271 | paging_init(void) | 271 | paging_init(void) |
| 272 | { | 272 | { |
| 273 | unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; | 273 | unsigned long zones_size[MAX_NR_ZONES] = {0, }; |
| 274 | unsigned long dma_pfn, high_pfn; | 274 | unsigned long dma_pfn, high_pfn; |
| 275 | 275 | ||
| 276 | dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; | 276 | dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; |