From 0b9c0ab67c36fb5259eb78b311666eb7ac6d9beb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 6 Sep 2018 15:27:51 +0100 Subject: [PATCH] [rt] Refresh patches and re-enable --- debian/config/defines | 2 +- debian/patches/features/all/rt/printk-kill.patch | 6 +++--- debian/patches/features/all/rt/x86-preempt-lazy.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/config/defines b/debian/config/defines index e4f46737f..52031054b 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -121,7 +121,7 @@ debug-info: true signed-code: false [featureset-rt_base] -enabled: false +enabled: true [description] part-long-up: This kernel is not suitable for SMP (multi-processor, diff --git a/debian/patches/features/all/rt/printk-kill.patch b/debian/patches/features/all/rt/printk-kill.patch index 64c736330..47845619e 100644 --- a/debian/patches/features/all/rt/printk-kill.patch +++ b/debian/patches/features/all/rt/printk-kill.patch @@ -88,9 +88,9 @@ Signed-off-by: Thomas Gleixner #ifdef CONFIG_PRINTK DECLARE_WAIT_QUEUE_HEAD(log_wait); /* the next printk record to read by syslog(READ) or /proc/kmsg */ -@@ -1836,6 +1888,13 @@ asmlinkage int vprintk_emit(int facility - int printed_len; +@@ -1886,6 +1938,13 @@ asmlinkage int vprintk_emit(int facility bool in_sched = false; + unsigned long flags; + /* + * Fall back to early_printk if a debugging subsystem has @@ -102,7 +102,7 @@ Signed-off-by: Thomas Gleixner if (level == LOGLEVEL_SCHED) { level = LOGLEVEL_DEFAULT; in_sched = true; -@@ -2017,26 +2076,6 @@ static bool suppress_message_printing(in +@@ -2026,26 +2085,6 @@ static bool suppress_message_printing(in #endif /* CONFIG_PRINTK */ diff --git a/debian/patches/features/all/rt/x86-preempt-lazy.patch b/debian/patches/features/all/rt/x86-preempt-lazy.patch index 4d1cd9f36..85d084bec 100644 --- a/debian/patches/features/all/rt/x86-preempt-lazy.patch +++ b/debian/patches/features/all/rt/x86-preempt-lazy.patch @@ -24,8 +24,8 @@ Signed-off-by: Thomas Gleixner select HAVE_PERF_USER_STACK_DUMP + select HAVE_PREEMPT_LAZY select HAVE_RCU_TABLE_FREE + select HAVE_RCU_TABLE_INVALIDATE if HAVE_RCU_TABLE_FREE select HAVE_REGS_AND_STACK_ACCESS_API - select HAVE_RELIABLE_STACKTRACE if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -133,7 +133,7 @@ static long syscall_trace_enter(struct p @@ -76,7 +76,7 @@ Signed-off-by: Thomas Gleixner call preempt_schedule_irq --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S -@@ -704,7 +704,23 @@ GLOBAL(swapgs_restore_regs_and_return_to +@@ -704,7 +704,23 @@ retint_kernel: bt $9, EFLAGS(%rsp) /* were interrupts off? */ jnc 1f 0: cmpl $0, PER_CPU_VAR(__preempt_count)