diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 11:16:43 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 11:16:43 +0200 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /arch/powerpc/mm | |
| parent | powerpc/mm: remove obsolete comment about page size name array (diff) | |
| parent | tty/hvc_opal: Fix debug function name (diff) | |
| download | linux-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.tar.xz linux-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.zip | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 7c28589d45bd..39b159751c35 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -641,7 +641,7 @@ static void __init parse_drconf_memory(struct device_node *memory) unsigned int n, rc, ranges, is_kexec_kdump = 0; unsigned long lmb_size, base, size, sz; int nid; - struct assoc_arrays aa; + struct assoc_arrays aa = { .arrays = NULL }; n = of_get_drconf_memory(memory, &dm); if (!n) |