diff options
author | Simon Horman <horms@verge.net.au> | 2010-02-02 14:42:02 +1100 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2010-02-02 14:42:02 +1100 |
commit | 563ee341d950f2fae0ba6608d70c19eb647ff943 (patch) | |
tree | 3b77ae07fdef3f457b3a7b00bf562cc2701c4744 | |
parent | 22b17e2d0c40d870b3cb35f95d1b4b2c7d109216 (diff) |
Use C99 initialisers
Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r-- | kexec/arch/arm/kexec-arm.c | 2 | ||||
-rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 2 | ||||
-rw-r--r-- | kexec/arch/ia64/kexec-ia64.c | 2 | ||||
-rw-r--r-- | kexec/arch/mips/kexec-mips.c | 2 | ||||
-rw-r--r-- | kexec/arch/ppc/kexec-ppc.c | 2 | ||||
-rw-r--r-- | kexec/arch/ppc64/kexec-ppc64.c | 2 | ||||
-rw-r--r-- | kexec/arch/s390/kexec-s390.c | 2 | ||||
-rw-r--r-- | kexec/arch/sh/kexec-sh.c | 2 | ||||
-rw-r--r-- | kexec/arch/x86_64/kexec-x86_64.c | 2 | ||||
-rw-r--r-- | kexec/kexec-elf-rel.c | 6 |
10 files changed, 12 insertions, 12 deletions
diff --git a/kexec/arch/arm/kexec-arm.c b/kexec/arch/arm/kexec-arm.c index 0d07e42..06ed8fd 100644 --- a/kexec/arch/arm/kexec-arm.c +++ b/kexec/arch/arm/kexec-arm.c @@ -110,7 +110,7 @@ int arch_process_options(int argc, char **argv) const struct arch_map_entry arches[] = { { "arm", KEXEC_ARCH_ARM }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index 477efc2..804dadd 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -171,7 +171,7 @@ static int exclude_crash_reserve_region(int *nr_ranges) { int i, j, tidx = -1; unsigned long long cstart, cend; - struct memory_range temp_region = { }; + struct memory_range temp_region = {0, 0, 0}; /* Crash reserved region. */ cstart = crash_reserved_mem.start; diff --git a/kexec/arch/ia64/kexec-ia64.c b/kexec/arch/ia64/kexec-ia64.c index 450931c..edd3674 100644 --- a/kexec/arch/ia64/kexec-ia64.c +++ b/kexec/arch/ia64/kexec-ia64.c @@ -208,7 +208,7 @@ int arch_process_options(int argc, char **argv) const struct arch_map_entry arches[] = { { "ia64", KEXEC_ARCH_IA_64 }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/mips/kexec-mips.c b/kexec/arch/mips/kexec-mips.c index bf6d193..cb75a2d 100644 --- a/kexec/arch/mips/kexec-mips.c +++ b/kexec/arch/mips/kexec-mips.c @@ -127,7 +127,7 @@ const struct arch_map_entry arches[] = { * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_MIPS here. */ { "mips", KEXEC_ARCH_DEFAULT }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c index 3a17f5f..a77804f 100644 --- a/kexec/arch/ppc/kexec-ppc.c +++ b/kexec/arch/ppc/kexec-ppc.c @@ -82,7 +82,7 @@ const struct arch_map_entry arches[] = { * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_PPC here. */ { "ppc", KEXEC_ARCH_DEFAULT }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c index 44208a0..d83cc3f 100644 --- a/kexec/arch/ppc64/kexec-ppc64.c +++ b/kexec/arch/ppc64/kexec-ppc64.c @@ -802,7 +802,7 @@ const struct arch_map_entry arches[] = { * So pass KEXEC_ARCH_PPC64 here */ { "ppc64", KEXEC_ARCH_PPC64 }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/s390/kexec-s390.c b/kexec/arch/s390/kexec-s390.c index 108ea47..4696891 100644 --- a/kexec/arch/s390/kexec-s390.c +++ b/kexec/arch/s390/kexec-s390.c @@ -98,7 +98,7 @@ int arch_process_options(int UNUSED(argc), char **UNUSED(argv)) const struct arch_map_entry arches[] = { { "s390", KEXEC_ARCH_S390 }, { "s390x", KEXEC_ARCH_S390 }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/sh/kexec-sh.c b/kexec/arch/sh/kexec-sh.c index 86bce27..93e62e2 100644 --- a/kexec/arch/sh/kexec-sh.c +++ b/kexec/arch/sh/kexec-sh.c @@ -135,7 +135,7 @@ const struct arch_map_entry arches[] = { { "sh4", KEXEC_ARCH_DEFAULT }, { "sh4a", KEXEC_ARCH_DEFAULT }, { "sh4al-dsp", KEXEC_ARCH_DEFAULT }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/arch/x86_64/kexec-x86_64.c b/kexec/arch/x86_64/kexec-x86_64.c index 6003eb8..49bfd36 100644 --- a/kexec/arch/x86_64/kexec-x86_64.c +++ b/kexec/arch/x86_64/kexec-x86_64.c @@ -145,7 +145,7 @@ const struct arch_map_entry arches[] = { * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_X86_64 here. */ { "x86_64", KEXEC_ARCH_DEFAULT }, - { 0 }, + { NULL, 0 }, }; int arch_compat_trampoline(struct kexec_info *UNUSED(info)) diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c index 1d3e22c..f102fb8 100644 --- a/kexec/kexec-elf-rel.c +++ b/kexec/kexec-elf-rel.c @@ -58,7 +58,7 @@ static size_t elf_rela_size(struct mem_ehdr *ehdr) static struct mem_sym elf_sym(struct mem_ehdr *ehdr, const unsigned char *ptr) { - struct mem_sym sym = { }; + struct mem_sym sym = { 0, 0, 0, 0, 0, 0 }; if (ehdr->ei_class == ELFCLASS32) { Elf32_Sym lsym; memcpy(&lsym, ptr, sizeof(lsym)); @@ -87,7 +87,7 @@ static struct mem_sym elf_sym(struct mem_ehdr *ehdr, const unsigned char *ptr) static struct mem_rela elf_rel(struct mem_ehdr *ehdr, const unsigned char *ptr) { - struct mem_rela rela = { }; + struct mem_rela rela = { 0, 0, 0, 0 }; if (ehdr->ei_class == ELFCLASS32) { Elf32_Rel lrel; memcpy(&lrel, ptr, sizeof(lrel)); @@ -112,7 +112,7 @@ static struct mem_rela elf_rel(struct mem_ehdr *ehdr, const unsigned char *ptr) static struct mem_rela elf_rela(struct mem_ehdr *ehdr, const unsigned char *ptr) { - struct mem_rela rela = { }; + struct mem_rela rela = { 0, 0, 0, 0 }; if (ehdr->ei_class == ELFCLASS32) { Elf32_Rela lrela; memcpy(&lrela, ptr, sizeof(lrela)); |