From 73842b70d40c5e6c3bcc74e8875f7b2297204d6b Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 1 May 2006 12:15:50 -0700 Subject: [PATCH] --- yaml --- r: 26393 b: refs/heads/master c: 5871aa6d5a98f315016d1deee07425c269c37f29 h: refs/heads/master i: 26391: 99f519f595d5f986eb53038d94f14e81b8939d32 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/setup.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c5bda67affa..3c14d0fc9d63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32828546b32a96d550b85eab25609bc4ba3942ab +refs/heads/master: 5871aa6d5a98f315016d1deee07425c269c37f29 diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c index 80cb3b2d0997..d77e89ac0d54 100644 --- a/trunk/arch/i386/kernel/setup.c +++ b/trunk/arch/i386/kernel/setup.c @@ -970,8 +970,10 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg) * not-overlapping, which is the case */ int __init -e820_all_mapped(unsigned long start, unsigned long end, unsigned type) +e820_all_mapped(unsigned long s, unsigned long e, unsigned type) { + u64 start = s; + u64 end = e; int i; for (i = 0; i < e820.nr_map; i++) { struct e820entry *ei = &e820.map[i];