aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-06-10 06:08:13 -0400
committerMichal Marek <mmarek@suse.cz>2014-06-10 08:00:53 -0400
commitbb66fc67192bbd406fe9c22033f1bbbf3e7ec621 (patch)
tree19948db86af0bc1d4662fca553d0a23c6e4d648d
parent7eb6e340526adf14ed7cf7dfde8b9c6fc0741cfc (diff)
kbuild: trivial - use tabs for code indent where possible
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--scripts/basic/fixdep.c8
-rw-r--r--scripts/docproc.c56
-rw-r--r--scripts/kallsyms.c2
-rw-r--r--scripts/kconfig/conf.c2
-rw-r--r--scripts/kconfig/gconf.c2
-rw-r--r--scripts/kconfig/lxdialog/checklist.c4
-rw-r--r--scripts/kconfig/lxdialog/inputbox.c2
-rw-r--r--scripts/kconfig/lxdialog/menubox.c4
-rw-r--r--scripts/kconfig/lxdialog/util.c2
-rw-r--r--scripts/kconfig/mconf.c2
-rw-r--r--scripts/kconfig/menu.c6
-rw-r--r--scripts/kconfig/zconf.l4
-rw-r--r--scripts/kconfig/zconf.lex.c_shipped4
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped2
-rw-r--r--scripts/kconfig/zconf.y2
-rw-r--r--scripts/mod/file2alias.c42
-rw-r--r--scripts/mod/modpost.c30
-rw-r--r--scripts/mod/sumversion.c4
-rwxr-xr-xscripts/tags.sh2
19 files changed, 89 insertions, 91 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 078fe1d64e7d..b30406860b73 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -409,10 +409,10 @@ static void print_deps(void)
409 exit(2); 409 exit(2);
410 } 410 }
411 if (fstat(fd, &st) < 0) { 411 if (fstat(fd, &st) < 0) {
412 fprintf(stderr, "fixdep: error fstat'ing depfile: "); 412 fprintf(stderr, "fixdep: error fstat'ing depfile: ");
413 perror(depfile); 413 perror(depfile);
414 exit(2); 414 exit(2);
415 } 415 }
416 if (st.st_size == 0) { 416 if (st.st_size == 0) {
417 fprintf(stderr,"fixdep: %s is empty\n",depfile); 417 fprintf(stderr,"fixdep: %s is empty\n",depfile);
418 close(fd); 418 close(fd);
diff --git a/scripts/docproc.c b/scripts/docproc.c
index 2b69eaf5b646..e267e621431a 100644
--- a/scripts/docproc.c
+++ b/scripts/docproc.c
@@ -154,7 +154,7 @@ int symfilecnt = 0;
154static void add_new_symbol(struct symfile *sym, char * symname) 154static void add_new_symbol(struct symfile *sym, char * symname)
155{ 155{
156 sym->symbollist = 156 sym->symbollist =
157 realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); 157 realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
158 sym->symbollist[sym->symbolcnt++].name = strdup(symname); 158 sym->symbollist[sym->symbolcnt++].name = strdup(symname);
159} 159}
160 160
@@ -215,7 +215,7 @@ static void find_export_symbols(char * filename)
215 char *p; 215 char *p;
216 char *e; 216 char *e;
217 if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) || 217 if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) ||
218 ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { 218 ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) {
219 /* Skip EXPORT_SYMBOL{_GPL} */ 219 /* Skip EXPORT_SYMBOL{_GPL} */
220 while (isalnum(*p) || *p == '_') 220 while (isalnum(*p) || *p == '_')
221 p++; 221 p++;
@@ -291,28 +291,28 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); }
291static void singfunc(char * filename, char * line) 291static void singfunc(char * filename, char * line)
292{ 292{
293 char *vec[200]; /* Enough for specific functions */ 293 char *vec[200]; /* Enough for specific functions */
294 int i, idx = 0; 294 int i, idx = 0;
295 int startofsym = 1; 295 int startofsym = 1;
296 vec[idx++] = KERNELDOC; 296 vec[idx++] = KERNELDOC;
297 vec[idx++] = DOCBOOK; 297 vec[idx++] = DOCBOOK;
298 vec[idx++] = SHOWNOTFOUND; 298 vec[idx++] = SHOWNOTFOUND;
299 299
300 /* Split line up in individual parameters preceded by FUNCTION */ 300 /* Split line up in individual parameters preceded by FUNCTION */
301 for (i=0; line[i]; i++) { 301 for (i=0; line[i]; i++) {
302 if (isspace(line[i])) { 302 if (isspace(line[i])) {
303 line[i] = '\0'; 303 line[i] = '\0';
304 startofsym = 1; 304 startofsym = 1;
305 continue; 305 continue;
306 } 306 }
307 if (startofsym) { 307 if (startofsym) {
308 startofsym = 0; 308 startofsym = 0;
309 vec[idx++] = FUNCTION; 309 vec[idx++] = FUNCTION;
310 vec[idx++] = &line[i]; 310 vec[idx++] = &line[i];
311 } 311 }
312 } 312 }
313 for (i = 0; i < idx; i++) { 313 for (i = 0; i < idx; i++) {
314 if (strcmp(vec[i], FUNCTION)) 314 if (strcmp(vec[i], FUNCTION))
315 continue; 315 continue;
316 consume_symbol(vec[i + 1]); 316 consume_symbol(vec[i + 1]);
317 } 317 }
318 vec[idx++] = filename; 318 vec[idx++] = filename;
@@ -460,14 +460,14 @@ static void parse_file(FILE *infile)
460 break; 460 break;
461 case 'D': 461 case 'D':
462 while (*s && !isspace(*s)) s++; 462 while (*s && !isspace(*s)) s++;
463 *s = '\0'; 463 *s = '\0';
464 symbolsonly(line+2); 464 symbolsonly(line+2);
465 break; 465 break;
466 case 'F': 466 case 'F':
467 /* filename */ 467 /* filename */
468 while (*s && !isspace(*s)) s++; 468 while (*s && !isspace(*s)) s++;
469 *s++ = '\0'; 469 *s++ = '\0';
470 /* function names */ 470 /* function names */
471 while (isspace(*s)) 471 while (isspace(*s))
472 s++; 472 s++;
473 singlefunctions(line +2, s); 473 singlefunctions(line +2, s);
@@ -515,11 +515,11 @@ int main(int argc, char *argv[])
515 } 515 }
516 /* Open file, exit on error */ 516 /* Open file, exit on error */
517 infile = fopen(argv[2], "r"); 517 infile = fopen(argv[2], "r");
518 if (infile == NULL) { 518 if (infile == NULL) {
519 fprintf(stderr, "docproc: "); 519 fprintf(stderr, "docproc: ");
520 perror(argv[2]); 520 perror(argv[2]);
521 exit(2); 521 exit(2);
522 } 522 }
523 523
524 if (strcmp("doc", argv[1]) == 0) { 524 if (strcmp("doc", argv[1]) == 0) {
525 /* Need to do this in two passes. 525 /* Need to do this in two passes.
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 1237dd7fb4ca..dc7aa45e80ce 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -123,7 +123,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)
123 } 123 }
124 if (strlen(str) > KSYM_NAME_LEN) { 124 if (strlen(str) > KSYM_NAME_LEN) {
125 fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" 125 fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"
126 "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", 126 "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
127 str, strlen(str), KSYM_NAME_LEN); 127 str, strlen(str), KSYM_NAME_LEN);
128 return -1; 128 return -1;
129 } 129 }
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index d19944f9c3ac..fef75fc756f4 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -696,7 +696,7 @@ int main(int ac, char **av)
696 } else if (input_mode == savedefconfig) { 696 } else if (input_mode == savedefconfig) {
697 if (conf_write_defconfig(defconfig_file)) { 697 if (conf_write_defconfig(defconfig_file)) {
698 fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), 698 fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
699 defconfig_file); 699 defconfig_file);
700 return 1; 700 return 1;
701 } 701 }
702 } else if (input_mode != listnewconfig) { 702 } else if (input_mode != listnewconfig) {
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index f2bee70e26f4..d0a35b21f308 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu)
1404 && (tree == tree2)) 1404 && (tree == tree2))
1405 continue; 1405 continue;
1406/* 1406/*
1407 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) 1407 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
1408 || (view_mode == FULL_VIEW) 1408 || (view_mode == FULL_VIEW)
1409 || (view_mode == SPLIT_VIEW))*/ 1409 || (view_mode == SPLIT_VIEW))*/
1410 1410
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 3b15c08ec1fa..8d016faa28d7 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -168,13 +168,13 @@ do_resize:
168 168
169 /* create new window for the list */ 169 /* create new window for the list */
170 list = subwin(dialog, list_height, list_width, y + box_y + 1, 170 list = subwin(dialog, list_height, list_width, y + box_y + 1,
171 x + box_x + 1); 171 x + box_x + 1);
172 172
173 keypad(list, TRUE); 173 keypad(list, TRUE);
174 174
175 /* draw a box around the list items */ 175 /* draw a box around the list items */
176 draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, 176 draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
177 dlg.menubox_border.atr, dlg.menubox.atr); 177 dlg.menubox_border.atr, dlg.menubox.atr);
178 178
179 /* Find length of longest item in order to center checklist */ 179 /* Find length of longest item in order to center checklist */
180 check_x = 0; 180 check_x = 0;
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 447a582198c9..d58de1dc5360 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
42 * Display a dialog box for inputing a string 42 * Display a dialog box for inputing a string
43 */ 43 */
44int dialog_inputbox(const char *title, const char *prompt, int height, int width, 44int dialog_inputbox(const char *title, const char *prompt, int height, int width,
45 const char *init) 45 const char *init)
46{ 46{
47 int i, x, y, box_y, box_x, box_width; 47 int i, x, y, box_y, box_x, box_width;
48 int input_x = 0, key = 0, button = -1; 48 int input_x = 0, key = 0, button = -1;
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index c93de0b2faca..11ae9ad7ac7b 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -64,7 +64,7 @@ static int menu_width, item_x;
64 * Print menu item 64 * Print menu item
65 */ 65 */
66static void do_print_item(WINDOW * win, const char *item, int line_y, 66static void do_print_item(WINDOW * win, const char *item, int line_y,
67 int selected, int hotkey) 67 int selected, int hotkey)
68{ 68{
69 int j; 69 int j;
70 char *menu_item = malloc(menu_width + 1); 70 char *menu_item = malloc(menu_width + 1);
@@ -182,7 +182,7 @@ static void do_scroll(WINDOW *win, int *scroll, int n)
182 * Display a menu for choosing among a number of options 182 * Display a menu for choosing among a number of options
183 */ 183 */
184int dialog_menu(const char *title, const char *prompt, 184int dialog_menu(const char *title, const char *prompt,
185 const void *selected, int *s_scroll) 185 const void *selected, int *s_scroll)
186{ 186{
187 int i, j, x, y, box_x, box_y; 187 int i, j, x, y, box_x, box_y;
188 int height, width, menu_height; 188 int height, width, menu_height;
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index 58a8289dd650..f7abdeb92af0 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -623,7 +623,7 @@ void item_make(const char *fmt, ...)
623void item_add_str(const char *fmt, ...) 623void item_add_str(const char *fmt, ...)
624{ 624{
625 va_list ap; 625 va_list ap;
626 size_t avail; 626 size_t avail;
627 627
628 avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str); 628 avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
629 629
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 0cc37b5c4021..14cea7463a62 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename)
299 int size; 299 int size;
300 300
301 size = snprintf(menu_backtitle, sizeof(menu_backtitle), 301 size = snprintf(menu_backtitle, sizeof(menu_backtitle),
302 "%s - %s", config_filename, rootmenu.prompt->text); 302 "%s - %s", config_filename, rootmenu.prompt->text);
303 if (size >= sizeof(menu_backtitle)) 303 if (size >= sizeof(menu_backtitle))
304 menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; 304 menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
305 set_dialog_backtitle(menu_backtitle); 305 set_dialog_backtitle(menu_backtitle);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 3ac2c9c6e280..a26cc5d2a9b0 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym)
258 "config symbol '%s' uses select, but is " 258 "config symbol '%s' uses select, but is "
259 "not boolean or tristate", sym->name); 259 "not boolean or tristate", sym->name);
260 else if (sym2->type != S_UNKNOWN && 260 else if (sym2->type != S_UNKNOWN &&
261 sym2->type != S_BOOLEAN && 261 sym2->type != S_BOOLEAN &&
262 sym2->type != S_TRISTATE) 262 sym2->type != S_TRISTATE)
263 prop_warn(prop, 263 prop_warn(prop,
264 "'%s' has wrong type. 'select' only " 264 "'%s' has wrong type. 'select' only "
265 "accept arguments of boolean and " 265 "accept arguments of boolean and "
@@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym)
268 case P_RANGE: 268 case P_RANGE:
269 if (sym->type != S_INT && sym->type != S_HEX) 269 if (sym->type != S_INT && sym->type != S_HEX)
270 prop_warn(prop, "range is only allowed " 270 prop_warn(prop, "range is only allowed "
271 "for int or hex symbols"); 271 "for int or hex symbols");
272 if (!menu_validate_number(sym, prop->expr->left.sym) || 272 if (!menu_validate_number(sym, prop->expr->left.sym) ||
273 !menu_validate_number(sym, prop->expr->right.sym)) 273 !menu_validate_number(sym, prop->expr->right.sym))
274 prop_warn(prop, "range is invalid"); 274 prop_warn(prop, "range is invalid");
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 1a9f53e535ca..6c62d93b4ffb 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -27,8 +27,8 @@ static char *text;
27static int text_size, text_asize; 27static int text_size, text_asize;
28 28
29struct buffer { 29struct buffer {
30 struct buffer *parent; 30 struct buffer *parent;
31 YY_BUFFER_STATE state; 31 YY_BUFFER_STATE state;
32}; 32};
33 33
34struct buffer *current_buf; 34struct buffer *current_buf;
diff --git a/scripts/kconfig/zconf.lex.c_shipped b/scripts/kconfig/zconf.lex.c_shipped
index a0521aa5974b..349a7f24315b 100644
--- a/scripts/kconfig/zconf.lex.c_shipped
+++ b/scripts/kconfig/zconf.lex.c_shipped
@@ -789,8 +789,8 @@ static char *text;
789static int text_size, text_asize; 789static int text_size, text_asize;
790 790
791struct buffer { 791struct buffer {
792 struct buffer *parent; 792 struct buffer *parent;
793 YY_BUFFER_STATE state; 793 YY_BUFFER_STATE state;
794}; 794};
795 795
796struct buffer *current_buf; 796struct buffer *current_buf;
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 25ae16ac75c8..de5e84ed3f96 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -2314,7 +2314,7 @@ void conf_parse(const char *name)
2314 for_all_symbols(i, sym) { 2314 for_all_symbols(i, sym) {
2315 if (sym_check_deps(sym)) 2315 if (sym_check_deps(sym))
2316 zconfnerrs++; 2316 zconfnerrs++;
2317 } 2317 }
2318 if (zconfnerrs) 2318 if (zconfnerrs)
2319 exit(1); 2319 exit(1);
2320 sym_set_change_count(1); 2320 sym_set_change_count(1);
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 0653886fac48..0f683cfa53e9 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -510,7 +510,7 @@ void conf_parse(const char *name)
510 for_all_symbols(i, sym) { 510 for_all_symbols(i, sym) {
511 if (sym_check_deps(sym)) 511 if (sym_check_deps(sym))
512 zconfnerrs++; 512 zconfnerrs++;
513 } 513 }
514 if (zconfnerrs) 514 if (zconfnerrs)
515 exit(1); 515 exit(1);
516 sym_set_change_count(1); 516 sym_set_change_count(1);
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 1924990a737f..e614ef689eee 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -644,28 +644,26 @@ ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry);
644 644
645static int do_of_entry (const char *filename, void *symval, char *alias) 645static int do_of_entry (const char *filename, void *symval, char *alias)
646{ 646{
647 int len; 647 int len;
648 char *tmp; 648 char *tmp;
649 DEF_FIELD_ADDR(symval, of_device_id, name); 649 DEF_FIELD_ADDR(symval, of_device_id, name);
650 DEF_FIELD_ADDR(symval, of_device_id, type); 650 DEF_FIELD_ADDR(symval, of_device_id, type);
651 DEF_FIELD_ADDR(symval, of_device_id, compatible); 651 DEF_FIELD_ADDR(symval, of_device_id, compatible);
652 652
653 len = sprintf (alias, "of:N%sT%s", 653 len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
654 (*name)[0] ? *name : "*", 654 (*type)[0] ? *type : "*");
655 (*type)[0] ? *type : "*"); 655
656 656 if (compatible[0])
657 if (compatible[0]) 657 sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
658 sprintf (&alias[len], "%sC%s", 658 *compatible);
659 (*type)[0] ? "*" : "", 659
660 *compatible); 660 /* Replace all whitespace with underscores */
661 661 for (tmp = alias; tmp && *tmp; tmp++)
662 /* Replace all whitespace with underscores */ 662 if (isspace (*tmp))
663 for (tmp = alias; tmp && *tmp; tmp++) 663 *tmp = '_';
664 if (isspace (*tmp)) 664
665 *tmp = '_'; 665 add_wildcard(alias);
666 666 return 1;
667 add_wildcard(alias);
668 return 1;
669} 667}
670ADD_TO_DEVTABLE("of", of_device_id, do_of_entry); 668ADD_TO_DEVTABLE("of", of_device_id, do_of_entry);
671 669
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 066355673930..cd766877871e 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -862,7 +862,7 @@ static const char *section_white_list[] =
862 * without "ax" / "aw". 862 * without "ax" / "aw".
863 */ 863 */
864static void check_section(const char *modname, struct elf_info *elf, 864static void check_section(const char *modname, struct elf_info *elf,
865 Elf_Shdr *sechdr) 865 Elf_Shdr *sechdr)
866{ 866{
867 const char *sec = sech_name(elf, sechdr); 867 const char *sec = sech_name(elf, sechdr);
868 868
@@ -1296,12 +1296,12 @@ static void print_section_list(const char * const list[20])
1296 */ 1296 */
1297static void report_sec_mismatch(const char *modname, 1297static void report_sec_mismatch(const char *modname,
1298 const struct sectioncheck *mismatch, 1298 const struct sectioncheck *mismatch,
1299 const char *fromsec, 1299 const char *fromsec,
1300 unsigned long long fromaddr, 1300 unsigned long long fromaddr,
1301 const char *fromsym, 1301 const char *fromsym,
1302 int from_is_func, 1302 int from_is_func,
1303 const char *tosec, const char *tosym, 1303 const char *tosec, const char *tosym,
1304 int to_is_func) 1304 int to_is_func)
1305{ 1305{
1306 const char *from, *from_p; 1306 const char *from, *from_p;
1307 const char *to, *to_p; 1307 const char *to, *to_p;
@@ -1441,7 +1441,7 @@ static void report_sec_mismatch(const char *modname,
1441} 1441}
1442 1442
1443static void check_section_mismatch(const char *modname, struct elf_info *elf, 1443static void check_section_mismatch(const char *modname, struct elf_info *elf,
1444 Elf_Rela *r, Elf_Sym *sym, const char *fromsec) 1444 Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
1445{ 1445{
1446 const char *tosec; 1446 const char *tosec;
1447 const struct sectioncheck *mismatch; 1447 const struct sectioncheck *mismatch;
@@ -1528,7 +1528,7 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
1528 case R_ARM_ABS32: 1528 case R_ARM_ABS32:
1529 /* From ARM ABI: (S + A) | T */ 1529 /* From ARM ABI: (S + A) | T */
1530 r->r_addend = (int)(long) 1530 r->r_addend = (int)(long)
1531 (elf->symtab_start + ELF_R_SYM(r->r_info)); 1531 (elf->symtab_start + ELF_R_SYM(r->r_info));
1532 break; 1532 break;
1533 case R_ARM_PC24: 1533 case R_ARM_PC24:
1534 case R_ARM_CALL: 1534 case R_ARM_CALL:
@@ -1538,8 +1538,8 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
1538 case R_ARM_THM_JUMP19: 1538 case R_ARM_THM_JUMP19:
1539 /* From ARM ABI: ((S + A) | T) - P */ 1539 /* From ARM ABI: ((S + A) | T) - P */
1540 r->r_addend = (int)(long)(elf->hdr + 1540 r->r_addend = (int)(long)(elf->hdr +
1541 sechdr->sh_offset + 1541 sechdr->sh_offset +
1542 (r->r_offset - sechdr->sh_addr)); 1542 (r->r_offset - sechdr->sh_addr));
1543 break; 1543 break;
1544 default: 1544 default:
1545 return 1; 1545 return 1;
@@ -1571,7 +1571,7 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
1571} 1571}
1572 1572
1573static void section_rela(const char *modname, struct elf_info *elf, 1573static void section_rela(const char *modname, struct elf_info *elf,
1574 Elf_Shdr *sechdr) 1574 Elf_Shdr *sechdr)
1575{ 1575{
1576 Elf_Sym *sym; 1576 Elf_Sym *sym;
1577 Elf_Rela *rela; 1577 Elf_Rela *rela;
@@ -1615,7 +1615,7 @@ static void section_rela(const char *modname, struct elf_info *elf,
1615} 1615}
1616 1616
1617static void section_rel(const char *modname, struct elf_info *elf, 1617static void section_rel(const char *modname, struct elf_info *elf,
1618 Elf_Shdr *sechdr) 1618 Elf_Shdr *sechdr)
1619{ 1619{
1620 Elf_Sym *sym; 1620 Elf_Sym *sym;
1621 Elf_Rel *rel; 1621 Elf_Rel *rel;
@@ -1685,7 +1685,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
1685 * be discarded and warns about it. 1685 * be discarded and warns about it.
1686 **/ 1686 **/
1687static void check_sec_ref(struct module *mod, const char *modname, 1687static void check_sec_ref(struct module *mod, const char *modname,
1688 struct elf_info *elf) 1688 struct elf_info *elf)
1689{ 1689{
1690 int i; 1690 int i;
1691 Elf_Shdr *sechdrs = elf->sechdrs; 1691 Elf_Shdr *sechdrs = elf->sechdrs;
@@ -1945,7 +1945,7 @@ static int add_versions(struct buffer *b, struct module *mod)
1945 s->name, mod->name); 1945 s->name, mod->name);
1946 } else { 1946 } else {
1947 merror("\"%s\" [%s.ko] undefined!\n", 1947 merror("\"%s\" [%s.ko] undefined!\n",
1948 s->name, mod->name); 1948 s->name, mod->name);
1949 err = 1; 1949 err = 1;
1950 } 1950 }
1951 } 1951 }
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index deb2994b04c4..944418da9fe3 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -214,7 +214,7 @@ static void md4_final_ascii(struct md4_ctx *mctx, char *out, unsigned int len)
214 mctx->block[14] = mctx->byte_count << 3; 214 mctx->block[14] = mctx->byte_count << 3;
215 mctx->block[15] = mctx->byte_count >> 29; 215 mctx->block[15] = mctx->byte_count >> 29;
216 le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - 216 le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
217 sizeof(uint64_t)) / sizeof(uint32_t)); 217 sizeof(uint64_t)) / sizeof(uint32_t));
218 md4_transform(mctx->hash, mctx->block); 218 md4_transform(mctx->hash, mctx->block);
219 cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t)); 219 cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t));
220 220
@@ -367,7 +367,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
367 break; 367 break;
368 /* Terminate line at first space, to get rid of final ' \' */ 368 /* Terminate line at first space, to get rid of final ' \' */
369 while (*p) { 369 while (*p) {
370 if (isspace(*p)) { 370 if (isspace(*p)) {
371 *p = '\0'; 371 *p = '\0';
372 break; 372 break;
373 } 373 }
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 4c425d25173c..e6b011fe1d0d 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -281,7 +281,7 @@ xtags()
281 emacs $1 281 emacs $1
282 else 282 else
283 all_target_sources | xargs $1 -a 283 all_target_sources | xargs $1 -a
284 fi 284 fi
285} 285}
286 286
287# Support um (which uses SUBARCH) 287# Support um (which uses SUBARCH)