summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPekka Enberg2009-03-05 16:04:26 +0100
committerIngo Molnar2009-03-06 15:25:52 +0100
commitc77a3b59c624454c501cbfa1a3611d5a00bf9532 (patch)
tree97c49ab2aa67fdd60d36923659970004a7c7fcc2 /arch
parentMerge branch 'x86/uv' into x86/core (diff)
downloadkernel-qcow2-linux-c77a3b59c624454c501cbfa1a3611d5a00bf9532.tar.gz
kernel-qcow2-linux-c77a3b59c624454c501cbfa1a3611d5a00bf9532.tar.xz
kernel-qcow2-linux-c77a3b59c624454c501cbfa1a3611d5a00bf9532.zip
x86: fix uninitialized variable in init_memory_mapping()
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> LKML-Reference: <1236265466.31324.9.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 6d63e3d1253d..15219e0d1243 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -134,8 +134,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
{
unsigned long page_size_mask = 0;
unsigned long start_pfn, end_pfn;
+ unsigned long ret = 0;
unsigned long pos;
- unsigned long ret;
struct map_range mr[NR_RANGE_MR];
int nr_range, i;