Home Home > GIT Browse > openSUSE-15.2
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-09-14 02:05:17 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-09-14 02:05:17 +0200
commit23d10d358a858db7190fbe4011fb533bc4d087c7 (patch)
tree9244176d0d8e3116168249998edf16db4a64a150
parentabf52a6807655328d2a3bd18dfec9759b6aad7c9 (diff)
parentf3297bb203a2f74f38fbf430a230cf81f6eaa3e3 (diff)
Merge branch 'SLE15-SP2' into openSUSE-15.2
-rw-r--r--arch/powerpc/platforms/pseries/setup.c3
-rw-r--r--kernel/tracepoint.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f5940cc71c37..63462e96cf0e 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -316,6 +316,9 @@ static void pseries_lpar_idle(void)
* low power mode by ceding processor to hypervisor
*/
+ if (!prep_irq_for_idle())
+ return;
+
/* Indicate to hypervisor that we are idle. */
get_lppaca()->idle = 1;
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index 73956eaff8a9..2c606225c8d2 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -375,7 +375,11 @@ static void for_each_tracepoint_range(
bool trace_module_has_bad_taint(struct module *mod)
{
return mod->taints & ~((1 << TAINT_OOT_MODULE) | (1 << TAINT_CRAP) |
- (1 << TAINT_UNSIGNED_MODULE));
+ (1 << TAINT_UNSIGNED_MODULE)
+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
+ | (1 << TAINT_EXTERNAL_SUPPORT) | (1 << TAINT_NO_SUPPORT)
+#endif
+ );
}
static BLOCKING_NOTIFIER_HEAD(tracepoint_notify_list);