diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-09-10 12:35:26 +0200 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-09-10 12:35:26 +0200 |
commit | 081834c311f2a7e54949e24e5c83fee5567e3823 (patch) | |
tree | bc8267363e56a915804ab351a5fa291659769d56 | |
parent | 001d9dc1753bc7e44dd69e94ce9af9e8dcb74668 (diff) | |
download | linux-rt-081834c311f2a7e54949e24e5c83fee5567e3823.tar.gz |
[ANNOUNCE] v4.18.7-rt4v4.18.7-rt4-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r-- | patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch | 4 | ||||
-rw-r--r-- | patches/block-blk-mq-move-blk_queue_usage_counter_release-in.patch | 6 | ||||
-rw-r--r-- | patches/cpumask-disable-offstack-on-rt.patch | 2 | ||||
-rw-r--r-- | patches/drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch | 4 | ||||
-rw-r--r-- | patches/drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch | 6 | ||||
-rw-r--r-- | patches/fs-dcache-use-swait_queue-instead-of-waitqueue.patch | 2 | ||||
-rw-r--r-- | patches/kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch | 2 | ||||
-rw-r--r-- | patches/libata-remove-ata_sff_data_xfer_noirq.patch | 2 | ||||
-rw-r--r-- | patches/localversion.patch | 2 | ||||
-rw-r--r-- | patches/printk-kill.patch | 6 | ||||
-rw-r--r-- | patches/printk-rt-aware.patch | 6 | ||||
-rw-r--r-- | patches/sched-mmdrop-delayed.patch | 2 | ||||
-rw-r--r-- | patches/x86-kvm-require-const-tsc-for-rt.patch | 2 | ||||
-rw-r--r-- | patches/x86-preempt-lazy.patch | 2 | ||||
-rw-r--r-- | patches/x86-use-gen-rwsem-spinlocks-rt.patch | 2 |
15 files changed, 25 insertions, 25 deletions
diff --git a/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch b/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch index 985ceb956329..bb0fa3e37319 100644 --- a/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch +++ b/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch @@ -57,7 +57,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c -@@ -2811,7 +2811,7 @@ static int _nfs4_open_and_get_state(stru +@@ -2818,7 +2818,7 @@ static int _nfs4_open_and_get_state(stru unsigned int seq; int ret; @@ -66,7 +66,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ret = _nfs4_proc_open(opendata, ctx); if (ret != 0) -@@ -2849,7 +2849,7 @@ static int _nfs4_open_and_get_state(stru +@@ -2856,7 +2856,7 @@ static int _nfs4_open_and_get_state(stru if (d_inode(dentry) == state->inode) { nfs_inode_attach_open_context(ctx); diff --git a/patches/block-blk-mq-move-blk_queue_usage_counter_release-in.patch b/patches/block-blk-mq-move-blk_queue_usage_counter_release-in.patch index cd6aec6bb56a..abf141ba06c1 100644 --- a/patches/block-blk-mq-move-blk_queue_usage_counter_release-in.patch +++ b/patches/block-blk-mq-move-blk_queue_usage_counter_release-in.patch @@ -51,7 +51,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/block/blk-core.c +++ b/block/blk-core.c -@@ -959,12 +959,21 @@ void blk_queue_exit(struct request_queue +@@ -965,12 +965,21 @@ void blk_queue_exit(struct request_queue percpu_ref_put(&q->q_usage_counter); } @@ -74,7 +74,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } static void blk_rq_timed_out_timer(struct timer_list *t) -@@ -1058,6 +1067,7 @@ struct request_queue *blk_alloc_queue_no +@@ -1064,6 +1073,7 @@ struct request_queue *blk_alloc_queue_no queue_flag_set_unlocked(QUEUE_FLAG_BYPASS, q); init_waitqueue_head(&q->mq_freeze_wq); @@ -82,7 +82,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Init percpu_ref in atomic mode so that it's faster to shutdown. -@@ -3939,6 +3949,8 @@ int __init blk_dev_init(void) +@@ -3948,6 +3958,8 @@ int __init blk_dev_init(void) if (!kblockd_workqueue) panic("Failed to create kblockd\n"); diff --git a/patches/cpumask-disable-offstack-on-rt.patch b/patches/cpumask-disable-offstack-on-rt.patch index 16a48e8b1a14..fdab49a15c95 100644 --- a/patches/cpumask-disable-offstack-on-rt.patch +++ b/patches/cpumask-disable-offstack-on-rt.patch @@ -46,7 +46,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -939,7 +939,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT +@@ -940,7 +940,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT config MAXSMP bool "Enable Maximum number of SMP Processors and NUMA Nodes" depends on X86_64 && SMP && DEBUG_KERNEL diff --git a/patches/drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch b/patches/drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch index 306605ab7c3e..06755adc5960 100644 --- a/patches/drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch +++ b/patches/drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch @@ -54,7 +54,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static inline bool init_done(struct zram *zram) { -@@ -893,6 +918,8 @@ static DEVICE_ATTR_RO(io_stat); +@@ -898,6 +923,8 @@ static DEVICE_ATTR_RO(io_stat); static DEVICE_ATTR_RO(mm_stat); static DEVICE_ATTR_RO(debug_stat); @@ -63,7 +63,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static void zram_meta_free(struct zram *zram, u64 disksize) { size_t num_pages = disksize >> PAGE_SHIFT; -@@ -923,6 +950,7 @@ static bool zram_meta_alloc(struct zram +@@ -928,6 +955,7 @@ static bool zram_meta_alloc(struct zram if (!huge_class_size) huge_class_size = zs_huge_class_size(zram->mem_pool); diff --git a/patches/drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch b/patches/drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch index 0b900a23e2c9..5d730716b4d5 100644 --- a/patches/drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch +++ b/patches/drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch @@ -62,7 +62,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* dynamic per-device compression frontend */ --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -1009,6 +1009,7 @@ static int __zram_bvec_read(struct zram +@@ -1014,6 +1014,7 @@ static int __zram_bvec_read(struct zram unsigned long handle; unsigned int size; void *src, *dst; @@ -70,7 +70,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (zram_wb_enabled(zram)) { zram_slot_lock(zram, index); -@@ -1043,6 +1044,7 @@ static int __zram_bvec_read(struct zram +@@ -1048,6 +1049,7 @@ static int __zram_bvec_read(struct zram size = zram_get_obj_size(zram, index); @@ -78,7 +78,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> src = zs_map_object(zram->mem_pool, handle, ZS_MM_RO); if (size == PAGE_SIZE) { dst = kmap_atomic(page); -@@ -1050,14 +1052,13 @@ static int __zram_bvec_read(struct zram +@@ -1055,14 +1057,13 @@ static int __zram_bvec_read(struct zram kunmap_atomic(dst); ret = 0; } else { diff --git a/patches/fs-dcache-use-swait_queue-instead-of-waitqueue.patch b/patches/fs-dcache-use-swait_queue-instead-of-waitqueue.patch index 6da42fd2ff1c..5ae1d532bedb 100644 --- a/patches/fs-dcache-use-swait_queue-instead-of-waitqueue.patch +++ b/patches/fs-dcache-use-swait_queue-instead-of-waitqueue.patch @@ -80,7 +80,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> INIT_HLIST_NODE(&dentry->d_u.d_alias); --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c -@@ -1195,7 +1195,7 @@ static int fuse_direntplus_link(struct f +@@ -1196,7 +1196,7 @@ static int fuse_direntplus_link(struct f struct inode *dir = d_inode(parent); struct fuse_conn *fc; struct inode *inode; diff --git a/patches/kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch b/patches/kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch index 93039d204622..f49672fb1c9b 100644 --- a/patches/kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch +++ b/patches/kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch @@ -27,7 +27,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> migrate_disable(); for_each_console(con) { if (exclusive_console && con != exclusive_console) -@@ -2519,6 +2524,11 @@ void console_unblank(void) +@@ -2528,6 +2533,11 @@ void console_unblank(void) { struct console *c; diff --git a/patches/libata-remove-ata_sff_data_xfer_noirq.patch b/patches/libata-remove-ata_sff_data_xfer_noirq.patch index bc7215b9f214..fafa8524e558 100644 --- a/patches/libata-remove-ata_sff_data_xfer_noirq.patch +++ b/patches/libata-remove-ata_sff_data_xfer_noirq.patch @@ -185,7 +185,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /** --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -1856,8 +1856,6 @@ extern unsigned int ata_sff_data_xfer(st +@@ -1858,8 +1858,6 @@ extern unsigned int ata_sff_data_xfer(st unsigned char *buf, unsigned int buflen, int rw); extern unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc, unsigned char *buf, unsigned int buflen, int rw); diff --git a/patches/localversion.patch b/patches/localversion.patch index e36eb4b6666a..03a80b8b0e80 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt3 ++-rt4 diff --git a/patches/printk-kill.patch b/patches/printk-kill.patch index 375e9d2dcc40..ae24fc0f978b 100644 --- a/patches/printk-kill.patch +++ b/patches/printk-kill.patch @@ -87,9 +87,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 @@ -101,7 +101,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 */ diff --git a/patches/printk-rt-aware.patch b/patches/printk-rt-aware.patch index 24414aa4039c..27a620e04acd 100644 --- a/patches/printk-rt-aware.patch +++ b/patches/printk-rt-aware.patch @@ -52,7 +52,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } int printk_delay_msec __read_mostly; -@@ -1958,20 +1970,30 @@ asmlinkage int vprintk_emit(int facility +@@ -1967,20 +1979,30 @@ asmlinkage int vprintk_emit(int facility /* If called from the scheduler, we can not call up(). */ if (!in_sched) { @@ -86,7 +86,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } wake_up_klogd(); -@@ -2423,6 +2445,10 @@ void console_unlock(void) +@@ -2432,6 +2454,10 @@ void console_unlock(void) console_seq++; raw_spin_unlock(&logbuf_lock); @@ -97,7 +97,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /* * While actively printing out messages, if another printk() * were to occur on another CPU, it may wait for this one to -@@ -2441,6 +2467,7 @@ void console_unlock(void) +@@ -2450,6 +2476,7 @@ void console_unlock(void) } printk_safe_exit_irqrestore(flags); diff --git a/patches/sched-mmdrop-delayed.patch b/patches/sched-mmdrop-delayed.patch index 63791456d875..eae2614e2aaa 100644 --- a/patches/sched-mmdrop-delayed.patch +++ b/patches/sched-mmdrop-delayed.patch @@ -23,7 +23,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> #include <linux/page-flags-layout.h> #include <linux/workqueue.h> -@@ -480,6 +481,9 @@ struct mm_struct { +@@ -483,6 +484,9 @@ struct mm_struct { bool tlb_flush_batched; #endif struct uprobes_state uprobes_state; diff --git a/patches/x86-kvm-require-const-tsc-for-rt.patch b/patches/x86-kvm-require-const-tsc-for-rt.patch index 6c811de281a3..8109c25c4ac0 100644 --- a/patches/x86-kvm-require-const-tsc-for-rt.patch +++ b/patches/x86-kvm-require-const-tsc-for-rt.patch @@ -14,7 +14,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -6594,6 +6594,13 @@ int kvm_arch_init(void *opaque) +@@ -6597,6 +6597,13 @@ int kvm_arch_init(void *opaque) goto out; } diff --git a/patches/x86-preempt-lazy.patch b/patches/x86-preempt-lazy.patch index d4009290d87c..b9a4d870b542 100644 --- a/patches/x86-preempt-lazy.patch +++ b/patches/x86-preempt-lazy.patch @@ -23,8 +23,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 diff --git a/patches/x86-use-gen-rwsem-spinlocks-rt.patch b/patches/x86-use-gen-rwsem-spinlocks-rt.patch index 910cc79499d4..2bc450e30145 100644 --- a/patches/x86-use-gen-rwsem-spinlocks-rt.patch +++ b/patches/x86-use-gen-rwsem-spinlocks-rt.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -261,8 +261,11 @@ config ARCH_MAY_HAVE_PC_FDC +@@ -262,8 +262,11 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_API |