diff options
| author | Jamey Sharp <jamey@thetovacompany.com> | 2008-04-22 16:21:10 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-04-24 11:21:31 +1000 |
| commit | eb5c1bab95722a56cc44beddd1eba8dd9470c82f (patch) | |
| tree | 8a6858a73812bfd48c4f9a515d96b219126a811a /kexec/kexec.c | |
| parent | d1e7c0fa1f66c74c0f0de9673041a19a1eceb35b (diff) | |
Replace weak definitions with source filename overriding.
This reduces the kexec-tools' demands on the capabilities of the
toolchain, and improves standards conformance, without really changing
maintenance complexity.
Signed-off-by: Jamey Sharp <jamey@thetovacompany.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec.c')
| -rw-r--r-- | kexec/kexec.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c index 20b2ae4..2a71ace 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -285,11 +285,6 @@ unsigned long locate_hole(struct kexec_info *info, return hole_base; } -unsigned long __attribute__((weak)) virt_to_phys(unsigned long addr) -{ - abort(); -} - void add_segment_phys_virt(struct kexec_info *info, const void *buf, size_t bufsz, unsigned long base, size_t memsz, int phys) @@ -342,13 +337,6 @@ void add_segment_phys_virt(struct kexec_info *info, } } -void __attribute__((weak)) add_segment(struct kexec_info *info, - const void *buf, size_t bufsz, - unsigned long base, size_t memsz) -{ - return add_segment_phys_virt(info, buf, bufsz, base, memsz, 0); -} - unsigned long add_buffer_phys_virt(struct kexec_info *info, const void *buf, unsigned long bufsz, unsigned long memsz, unsigned long buf_align, unsigned long buf_min, unsigned long buf_max, @@ -385,19 +373,6 @@ unsigned long add_buffer_virt(struct kexec_info *info, const void *buf, buf_min, buf_max, buf_end, 0); } -unsigned long __attribute__((weak)) add_buffer(struct kexec_info *info, - const void *buf, - unsigned long bufsz, - unsigned long memsz, - unsigned long buf_align, - unsigned long buf_min, - unsigned long buf_max, - int buf_end) -{ - return add_buffer_virt(info, buf, bufsz, memsz, buf_align, - buf_min, buf_max, buf_end); -} - char *slurp_file(const char *filename, off_t *r_size) { int fd; @@ -836,12 +811,6 @@ void check_reuse_initrd(void) fclose(fp); } -/* Arch hook for reuse_initrd */ -void __attribute__((weak)) arch_reuse_initrd(void) -{ - die("--reuseinitrd not implemented on this architecture\n"); -} - int main(int argc, char *argv[]) { int do_load = 1; |