projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-microblaze.git]
/
arch
/
ia64
/
include
/
asm
/
meminit.h
diff --git
a/arch/ia64/include/asm/meminit.h
b/arch/ia64/include/asm/meminit.h
index
6c47a23
..
f1d5bf2
100644
(file)
--- a/
arch/ia64/include/asm/meminit.h
+++ b/
arch/ia64/include/asm/meminit.h
@@
-29,7
+29,6
@@
struct rsvd_region {
};
extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
};
extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
-extern int num_rsvd_regions;
extern void find_memory (void);
extern void reserve_memory (void);
extern void find_memory (void);
extern void reserve_memory (void);
@@
-40,7
+39,6
@@
extern unsigned long efi_memmap_init(u64 *s, u64 *e);
extern int find_max_min_low_pfn (u64, u64, void *);
extern unsigned long vmcore_find_descriptor_size(unsigned long address);
extern int find_max_min_low_pfn (u64, u64, void *);
extern unsigned long vmcore_find_descriptor_size(unsigned long address);
-extern int reserve_elfcorehdr(u64 *start, u64 *end);
/*
* For rounding an address to the next IA64_GRANULE_SIZE or order
/*
* For rounding an address to the next IA64_GRANULE_SIZE or order