diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2007-12-13 16:18:53 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2007-12-19 14:50:06 +0900 |
| commit | 0151e38f0d87528c8856fcb0b4d53ed547c139b0 (patch) | |
| tree | f9f79379e079be6f93c77ada61586d0cd738a173 | |
| parent | 1db6397fc7a335decfa7ed95a95225476a030390 (diff) | |
| download | kexec-tools-0151e38f0d87528c8856fcb0b4d53ed547c139b0.tar.gz | |
Consolidate BOOTLOADER defines
The BOOTLOADER and BOOTLOADER_VERSION #defines are repeated in multiple
files. This change removes the unnecessary definition of these, and
keeps the kexec/kexec.h as the main source.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/kexec-multiboot-x86.c | 2 | ||||
| -rw-r--r-- | kexec/arch/ppc/kexec-dol-ppc.c | 2 | ||||
| -rw-r--r-- | kexec/arch/ppc/kexec-elf-ppc.c | 2 | ||||
| -rw-r--r-- | kexec/arch/ppc64/kexec-elf-ppc64.c | 3 |
4 files changed, 0 insertions, 9 deletions
diff --git a/kexec/arch/i386/kexec-multiboot-x86.c b/kexec/arch/i386/kexec-multiboot-x86.c index 8ec8bba..5ad279a 100644 --- a/kexec/arch/i386/kexec-multiboot-x86.c +++ b/kexec/arch/i386/kexec-multiboot-x86.c @@ -61,8 +61,6 @@ static char headerbuf[MULTIBOOT_SEARCH]; static struct multiboot_header *mbh = NULL; -#define BOOTLOADER "kexec" -#define BOOTLOADER_VERSION VERSION #define MIN(_x,_y) (((_x)<=(_y))?(_x):(_y)) diff --git a/kexec/arch/ppc/kexec-dol-ppc.c b/kexec/arch/ppc/kexec-dol-ppc.c index 1b34f2a..5e7e078 100644 --- a/kexec/arch/ppc/kexec-dol-ppc.c +++ b/kexec/arch/ppc/kexec-dol-ppc.c @@ -90,8 +90,6 @@ typedef struct { #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) -#define BOOTLOADER "kexec" -#define BOOTLOADER_VERSION VERSION #define MAX_COMMAND_LINE 256 #define UPSZ(X) ((sizeof(X) + 3) & ~3) diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c index e5e5ebd..241c803 100644 --- a/kexec/arch/ppc/kexec-elf-ppc.c +++ b/kexec/arch/ppc/kexec-elf-ppc.c @@ -27,8 +27,6 @@ static const int probe_debug = 0; -#define BOOTLOADER "kexec" -#define BOOTLOADER_VERSION VERSION #define MAX_COMMAND_LINE 256 #define UPSZ(X) ((sizeof(X) + 3) & ~3) diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c index 165a0f6..a8df885 100644 --- a/kexec/arch/ppc64/kexec-elf-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-ppc64.c @@ -39,9 +39,6 @@ #include "crashdump-ppc64.h" #include <arch/options.h> -#define BOOTLOADER "kexec" -#define BOOTLOADER_VERSION VERSION - uint64_t initrd_base, initrd_size; unsigned char reuse_initrd = 0; const char *ramdisk; |