[rt] Refresh patches and re-enable

This commit is contained in:
Ben Hutchings 2018-09-06 15:27:51 +01:00
parent cfd1053360
commit 0b9c0ab67c
3 changed files with 6 additions and 6 deletions

View File

@ -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,

View File

@ -88,9 +88,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#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 <tglx@linutronix.de>
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 */

View File

@ -24,8 +24,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
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)