Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ebf5afb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9fc13bbd 48084abf

kernel/watchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

tools/objtool/check.c

+2 −1
Original line number Diff line number Diff line
@@ -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;