From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [GIT pull] core updates for 5.1
Date: Sun, 24 Mar 2019 14:12:21 -0000 [thread overview]
Message-ID: <155343674151.28403.7455818401538063350.tglx@nanos.tec.linutronix.de> (raw)
Linus,
please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
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.
Thanks,
tglx
------------------>
Josh Poimboeuf (1):
objtool: Move objtool_file struct off the stack
Valdis Kletnieks (1):
watchdog/core: Make variables static
kernel/watchdog.c | 4 ++--
tools/objtool/check.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 8fbfda94a67b..403c9bd90413 100644
--- 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
index 0414a0d52262..5dde107083c6 100644
--- 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;
next reply other threads:[~2019-03-24 14:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-24 14:12 Thomas Gleixner [this message]
2019-03-24 14:12 ` [GIT pull] timers updates for 5.1 Thomas Gleixner
2019-03-24 18:40 ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] irq " Thomas Gleixner
2019-03-24 18:40 ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] perf " Thomas Gleixner
2019-03-24 18:40 ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] x86 " Thomas Gleixner
2019-03-24 18:40 ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] locking " Thomas Gleixner
2019-03-24 18:40 ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] scheduler " Thomas Gleixner
2019-03-24 18:07 ` Linus Torvalds
2019-03-24 18:39 ` Thomas Gleixner
2019-03-24 18:48 ` Linus Torvalds
2019-03-24 19:01 ` Linus Torvalds
2019-03-24 18:40 ` [GIT pull] core " pr-tracker-bot
2019-03-31 10:39 Thomas Gleixner
2019-03-31 16:00 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=155343674151.28403.7455818401538063350.tglx@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).