History

Merge branch 'linus' into locking/kcsan, to pick up fixes

Ingo Molnar committed 6 years ago

Commit df108462 parents a4654e9 5ad0ec0906 files · +8764 −4406Browse files

Showing the changes to scripts (7 of 906 files). Show all

Unified · Split

7 files
  1. scripts/Kconfig.include +7 −0
  2. scripts/Makefile.extrawarn +1 −0
  3. scripts/Makefile.lib +3 −3
  4. scripts/export_report.pl +1 −1
  5. scripts/kallsyms.c +4 −4
  6. scripts/mod/modpost.c +14 −13
  7. scripts/parse-maintainers.pl +0 −0
scripts/Kconfig.include+7−0
@@ -44,3 +44,10 @@ $(error-if,$(success, $(LD) -v | grep -q gold), gold linker '$(LD)' not supporte · 43 unmodified lines
4444
4545 # gcc version including patch level
4646 gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh $(CC))
47+
48+# machine bit flags
49+# $(m32-flag): -m32 if the compiler supports it, or an empty string otherwise.
50+# $(m64-flag): -m64 if the compiler supports it, or an empty string otherwise.
51+cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null,$(1))
52+m32-flag := $(cc-option-bit,-m32)
53+m64-flag := $(cc-option-bit,-m64)
scripts/Makefile.extrawarn+1−0
@@ -48,6 +48,7 @@ KBUILD_CFLAGS += -Wno-initializer-overrides · 47 unmodified lines
4848 KBUILD_CFLAGS += -Wno-format
4949 KBUILD_CFLAGS += -Wno-sign-compare
5050 KBUILD_CFLAGS += -Wno-format-zero-length
51+KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast)
5152 endif
5253
5354 endif
scripts/Makefile.lib+3−3
@@ -310,15 +310,15 @@ DT_BINDING_DIR := Documentation/devicetree/bindings · 309 unmodified lines
310310 DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
311311
312312 quiet_cmd_dtb_check = CHECK $@
313− cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ;
313+ cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@
314314
315−define rule_dtc_dt_yaml
315+define rule_dtc
316316 $(call cmd_and_fixdep,dtc,yaml)
317317 $(call cmd,dtb_check)
318318 endef
319319
320320 $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
321− $(call if_changed_rule,dtc_dt_yaml)
321+ $(call if_changed_rule,dtc)
322322
323323 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
324324
scripts/export_report.pl+1−1
@@ -94,7 +94,7 @@ if (defined $opt{'o'}) { · 93 unmodified lines
9494 #
9595 while ( <$module_symvers> ) {
9696 chomp;
97− my (undef, $symbol, $namespace, $module, $gpl) = split('\t');
97+ my (undef, $symbol, $module, $gpl, $namespace) = split('\t');
9898 $SYMBOL { $symbol } = [ $module , "0" , $symbol, $gpl];
9999 }
100100 close($module_symvers);
scripts/kallsyms.c+4−4
@@ -195,13 +195,13 @@ static struct sym_entry *read_symbol(FILE *in) · 194 unmodified lines
195195 return NULL;
196196 }
197197
198− if (is_ignored_symbol(name, type))
199− return NULL;
200−
201− /* Ignore most absolute/undefined (?) symbols. */
202198 if (strcmp(name, "_text") == 0)
203199 _text = addr;
204200
201+ /* Ignore most absolute/undefined (?) symbols. */
202+ if (is_ignored_symbol(name, type))
203+ return NULL;
204+
205205 check_symbol_range(name, addr, text_ranges, ARRAY_SIZE(text_ranges));
206206 check_symbol_range(name, addr, &percpu_range, 1);
207207
scripts/mod/modpost.c+14−13
@@ -308,7 +308,8 @@ static const char *sec_name(struct elf_info *elf, int secindex) · 307 unmodified lines
308308
309309 static void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym)
310310 {
311− Elf_Shdr *sechdr = &info->sechdrs[sym->st_shndx];
311+ unsigned int secindex = get_secindex(info, sym);
312+ Elf_Shdr *sechdr = &info->sechdrs[secindex];
312313 unsigned long offset;
313314
314315 offset = sym->st_value;
@@ -2427,7 +2428,7 @@ static void write_if_changed(struct buffer *b, const char *fname) · 2112 unmodified lines
24272428 }
24282429
24292430 /* parse Module.symvers file. line format:
2430− * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something]
2431+ * 0x12345678<tab>symbol<tab>module<tab>export<tab>namespace
24312432 **/
24322433 static void read_dump(const char *fname, unsigned int kernel)
24332434 {
@@ -2440,7 +2441,7 @@ static void read_dump(const char *fname, unsigned int kernel) · 6 unmodified lines
24402441 return;
24412442
24422443 while ((line = get_next_line(&pos, file, size))) {
2443− char *symname, *namespace, *modname, *d, *export, *end;
2444+ char *symname, *namespace, *modname, *d, *export;
24442445 unsigned int crc;
24452446 struct module *mod;
24462447 struct symbol *s;
@@ -2448,16 +2449,16 @@ static void read_dump(const char *fname, unsigned int kernel) · 1 unmodified line
24482449 if (!(symname = strchr(line, '\t')))
24492450 goto fail;
24502451 *symname++ = '\0';
2451− if (!(namespace = strchr(symname, '\t')))
2452− goto fail;
2453− *namespace++ = '\0';
2454− if (!(modname = strchr(namespace, '\t')))
2452+ if (!(modname = strchr(symname, '\t')))
24552453 goto fail;
24562454 *modname++ = '\0';
2457− if ((export = strchr(modname, '\t')) != NULL)
2458− *export++ = '\0';
2459− if (export && ((end = strchr(export, '\t')) != NULL))
2460− *end = '\0';
2455+ if (!(export = strchr(modname, '\t')))
2456+ goto fail;
2457+ *export++ = '\0';
2458+ if (!(namespace = strchr(export, '\t')))
2459+ goto fail;
2460+ *namespace++ = '\0';
2461+
24612462 crc = strtoul(line, &d, 16);
24622463 if (*symname == '\0' || *modname == '\0' || *d != '\0')
24632464 goto fail;
@@ -2508,9 +2509,9 @@ static void write_dump(const char *fname) · 44 unmodified lines
25082509 namespace = symbol->namespace;
25092510 buf_printf(&buf, "0x%08x\t%s\t%s\t%s\t%s\n",
25102511 symbol->crc, symbol->name,
2511− namespace ? namespace : "",
25122512 symbol->module->name,
2513− export_str(symbol->export));
2513+ export_str(symbol->export),
2514+ namespace ? namespace : "");
25142515 }
25152516 symbol = symbol->next;
25162517 }
scripts/parse-maintainers.pl+0−0

File mode changed from 100644 to 100755.