Skip to content

Commit

Permalink
x86: Remove not used early_res code
Browse files Browse the repository at this point in the history
and some functions in e820.c that are not used anymore

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Yinghai Lu authored and H. Peter Anvin committed Aug 27, 2010
1 parent a9ce6bc commit a587d2d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 680 deletions.
14 changes: 0 additions & 14 deletions arch/x86/include/asm/e820.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,17 @@ static inline void early_memtest(unsigned long start, unsigned long end)
}
#endif

extern unsigned long end_user_pfn;

extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align);
extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align);
extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);

extern unsigned long e820_end_of_ram_pfn(void);
extern unsigned long e820_end_of_low_ram_pfn(void);
extern void e820_register_active_regions(int nid, unsigned long start_pfn,
unsigned long end_pfn);
extern u64 e820_hole_size(u64 start, u64 end);

extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);

void memblock_x86_fill(void);

extern void finish_e820_parsing(void);
extern void e820_reserve_resources(void);
extern void e820_reserve_resources_late(void);
extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void);

void reserve_early(u64 start, u64 end, char *name);
void free_early(u64 start, u64 end);

/*
* Returns true iff the specified range [s,e) is completely contained inside
* the ISA region.
Expand Down
52 changes: 0 additions & 52 deletions arch/x86/kernel/e820.c
Original file line number Diff line number Diff line change
Expand Up @@ -738,32 +738,6 @@ static int __init e820_mark_nvs_memory(void)
core_initcall(e820_mark_nvs_memory);
#endif

/*
* Find a free area with specified alignment in a specific range.
*/
u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)
{
u64 mem = memblock_find_in_range(start, end, size, align);

if (mem == MEMBLOCK_ERROR)
return -1ULL;

return mem;
}

/*
* Find next free range after *start
*/
u64 __init find_e820_area_size(u64 start, u64 *sizep, u64 align)
{
u64 mem = memblock_x86_find_in_range_size(start, sizep, align);

if (mem == MEMBLOCK_ERROR)
return -1ULL

return mem;
}

/*
* pre allocated 4k and reserved it in memblock and e820_saved
*/
Expand Down Expand Up @@ -856,32 +830,6 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM);
}

/* Walk the e820 map and register active regions within a node */
void __init e820_register_active_regions(int nid, unsigned long start_pfn,
unsigned long last_pfn)
{
memblock_x86_register_active_regions(nid, start_pfn, last_pfn);
}

/*
* Find the hole size (in bytes) in the memory range.
* @start: starting address of the memory range to scan
* @end: ending address of the memory range to scan
*/
u64 __init e820_hole_size(u64 start, u64 end)
{
return memblock_x86_hole_size(start, end);
}

void reserve_early(u64 start, u64 end, char *name)
{
memblock_x86_reserve_range(start, end, name);
}
void free_early(u64 start, u64 end)
{
memblock_x86_free_range(start, end);
}

static void early_panic(char *msg)
{
early_printk(msg);
Expand Down
23 changes: 0 additions & 23 deletions include/linux/early_res.h

This file was deleted.

1 change: 0 additions & 1 deletion kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \
hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \
async.o range.o
obj-$(CONFIG_HAVE_EARLY_RES) += early_res.o
obj-y += groups.o

ifdef CONFIG_FUNCTION_TRACER
Expand Down
Loading

0 comments on commit a587d2d

Please sign in to comment.