Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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

+4 -3
+2 -2
kernel/watchdog.c
··· 42 42 int __read_mostly nmi_watchdog_user_enabled = NMI_WATCHDOG_DEFAULT; 43 43 int __read_mostly soft_watchdog_user_enabled = 1; 44 44 int __read_mostly watchdog_thresh = 10; 45 - int __read_mostly nmi_watchdog_available; 45 + static int __read_mostly nmi_watchdog_available; 46 46 47 - struct cpumask watchdog_allowed_mask __read_mostly; 47 + static struct cpumask watchdog_allowed_mask __read_mostly; 48 48 49 49 struct cpumask watchdog_cpumask __read_mostly; 50 50 unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
+2 -1
tools/objtool/check.c
··· 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;