From 7d80ae3e4f1dd73fb61010e5a84135d3e92ba47e Mon Sep 17 00:00:00 2001 From: Alexey Makhalov Date: Tue, 9 May 2017 12:26:58 -0700 Subject: [PATCH] Patch from Clear Linux Signed-off-by: Bo Gan --- drivers/video/fbdev/core/fbcon.c | 2 +- include/linux/blk-mq.h | 2 +- init/do_mounts.c | 2 +- mm/vmstat.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index c910e74..59e1c7c 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -148,7 +148,7 @@ static const struct consw fb_con; #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row) -static int fbcon_cursor_noblink; +static int fbcon_cursor_noblink = 1; #define divides(a, b) ((!(a) || (b)%(a)) ? 0 : 1) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 1532cd07a597..01ef715ad1a8 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -12,7 +12,7 @@ struct blk_mq_tags; struct blk_flush_queue; #define BLKDEV_MIN_RQ 4 -#define BLKDEV_DEFAULT_RQ 128 +#define BLKDEV_DEFAULT_RQ 4096 enum rq_end_io_ret { RQ_END_IO_NONE, diff --git a/init/do_mounts.c b/init/do_mounts.c index e083d54fa167..3ad54972f2c2 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -614,7 +614,7 @@ void __init prepare_namespace(void) * For example, it is not atypical to wait 5 seconds here * for the touchpad of a laptop to initialize. */ - wait_for_device_probe(); + async_synchronize_full(); md_run_setup(); diff --git a/mm/vmstat.c b/mm/vmstat.c index 90af9a8572f5..9ede6a77f2b2 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1874,7 +1874,7 @@ static const struct seq_operations vmstat_op = { #ifdef CONFIG_SMP static DEFINE_PER_CPU(struct delayed_work, vmstat_work); -int sysctl_stat_interval __read_mostly = HZ; +int sysctl_stat_interval __read_mostly = 8 * HZ; #ifdef CONFIG_PROC_FS static void refresh_vm_stats(struct work_struct *work)