Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ca820181fc187af316a18b2700582663662c4012

Authored by Robert P. J. Day
Committed by Adrian Bunk
1 parent d08df601a3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Use ARRAY_SIZE() macro in i386 relocs.c file 

Change the explicit code in the relocs.c file to use ARRAY_SIZE()
and add a definition of ARRAY_SIZE() since this is a userspace program
and wouldn't include kernel.h.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

arch/i386/boot/compressed/relocs.c
Diff comments   View file @ ca82018
... ... @@ -11,6 +11,7 @@
11 11 #include <endian.h>
12 12  
13 13 #define MAX_SHDRS 100
  14 +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
14 15 static Elf32_Ehdr ehdr;
15 16 static Elf32_Shdr shdr[MAX_SHDRS];
16 17 static Elf32_Sym *symtab[MAX_SHDRS];
... ... @@ -71,7 +72,7 @@
71 72 #undef SYM_TYPE
72 73 };
73 74 const char *name = "unknown sym type name";
74   - if (type < sizeof(type_name)/sizeof(type_name[0])) {
  75 + if (type < ARRAY_SIZE(type_name)) {
75 76 name = type_name[type];
76 77 }
77 78 return name;
... ... @@ -87,7 +88,7 @@
87 88 #undef SYM_BIND
88 89 };
89 90 const char *name = "unknown sym bind name";
90   - if (bind < sizeof(bind_name)/sizeof(bind_name[0])) {
  91 + if (bind < ARRAY_SIZE(bind_name)) {
91 92 name = bind_name[bind];
92 93 }
93 94 return name;
... ... @@ -104,7 +105,7 @@
104 105 #undef SYM_VISIBILITY
105 106 };
106 107 const char *name = "unknown sym visibility name";
107   - if (visibility < sizeof(visibility_name)/sizeof(visibility_name[0])) {
  108 + if (visibility < ARRAY_SIZE(visibility_name)) {
108 109 name = visibility_name[visibility];
109 110 }
110 111 return name;
... ... @@ -128,7 +129,7 @@
128 129 #undef REL_TYPE
129 130 };
130 131 const char *name = "unknown type rel type name";
131   - if (type < sizeof(type_name)/sizeof(type_name[0])) {
  132 + if (type < ARRAY_SIZE(type_name)) {
132 133 name = type_name[type];
133 134 }
134 135 return name;