x86: merge setup_memory_map with e820
authorYinghai Lu <yhlu.kernel@gmail.com>
Tue, 17 Jun 2008 02:58:28 +0000 (19:58 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 08:38:25 +0000 (10:38 +0200)
commit064d25f12014ae1d97c2882f9ab874995321f2b2
treea6f39b226bbae5a2abc15d911cdf12d01b9c8c19
parentcc9f7a0ccf000d4db5fbdc7b0ae48eefea102f69
x86: merge setup_memory_map with e820

... and kill e820_32/64.c and e820_32/64.h

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/Makefile
arch/x86/kernel/e820.c
arch/x86/kernel/e820_32.c [deleted file]
arch/x86/kernel/e820_64.c [deleted file]
arch/x86/kernel/setup_64.c
arch/x86/mach-default/setup.c
arch/x86/mm/init_64.c
include/asm-x86/e820.h
include/asm-x86/e820_32.h [deleted file]
include/asm-x86/e820_64.h [deleted file]
include/asm-x86/setup.h