Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 1ebf5afb23cd · 2019-03-24T10:17:33.000-07:00
Pull core fixes from Thomas Gleixner:
 "Two small fixes:

   - Move the large objtool_file struct off the stack so objtool works
     in setups with a tight stack limit.

   - Make a few variables static in the watchdog core code"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  watchdog/core: Make variables static
  objtool: Move objtool_file struct off the stack
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
@@ -42,9 +42,9 @@ int __read_mostly watchdog_user_enabled = 1;
 int __read_mostly nmi_watchdog_user_enabled = NMI_WATCHDOG_DEFAULT;
 int __read_mostly soft_watchdog_user_enabled = 1;
 int __read_mostly watchdog_thresh = 10;
-int __read_mostly nmi_watchdog_available;
+static int __read_mostly nmi_watchdog_available;
 
-struct cpumask watchdog_allowed_mask __read_mostly;
+static struct cpumask watchdog_allowed_mask __read_mostly;
 
 struct cpumask watchdog_cpumask __read_mostly;
 unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
@@ -2184,9 +2184,10 @@ static void cleanup(struct objtool_file *file)
 	elf_close(file->elf);
 }
 
+static struct objtool_file file;
+
 int check(const char *_objname, bool orc)
 {
-	struct objtool_file file;
 	int ret, warnings = 0;
 
 	objname = _objname;

Original file line number	Diff line number	Diff line change
`@@ -2184,9 +2184,10 @@ static void cleanup(struct objtool_file *file)`
`2184`	`2184`	`elf_close(file->elf);`
`2185`	`2185`	`}`
`2186`	`2186`
	`2187`	`+static struct objtool_file file;`
	`2188`	`+`
`2187`	`2189`	`int check(const char *_objname, bool orc)`
`2188`	`2190`	`{`
`2189`		`- struct objtool_file file;`
`2190`	`2191`	`int ret, warnings = 0;`
`2191`	`2192`
`2192`	`2193`	`objname = _objname;`