summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog_hld.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
commit649e441f49d4bfb717e9467950891dc452f4e063 (patch)
tree2bdfdca65519db2f350c236cbbd65f24d5746cad /kernel/watchdog_hld.c
parent42f930da7f00c0ab23df4c7aed36137f35988980 (diff)
parent5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff)
downloadlinux-649e441f49d4bfb717e9467950891dc452f4e063.tar.bz2
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/watchdog_hld.c')
-rw-r--r--kernel/watchdog_hld.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
index a84b205fac9a..e449a23e9d59 100644
--- a/kernel/watchdog_hld.c
+++ b/kernel/watchdog_hld.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Detect hard lockups on a system
*