Unverified Commit d451deca authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!782 openEuler supports bcache by default on x86 platforms 

Merge Pull Request from: @Tom_zc 
 
Fix issue https://gitee.com/openeuler/kernel/issues/I6N4EP,
And solve the kabi change caused by enabling bcache in x86 platforms.
Related PR: 
        https://gitee.com/openeuler/kernel/pulls/757
        https://gitee.com/openeuler/kernel/pulls/771 
 
Link:https://gitee.com/openeuler/kernel/pulls/782

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 9995aad5 79f2ef71

arch/x86/configs/openeuler_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -2522,7 +2522,10 @@ CONFIG_MD_RAID456=m 
# CONFIG_MD_MULTIPATH is not set

CONFIG_MD_FAULTY=m

# CONFIG_MD_CLUSTER is not set

# CONFIG_BCACHE is not set

CONFIG_BCACHE=m

# CONFIG_BCACHE_DEBUG is not set

# CONFIG_BCACHE_CLOSURES_DEBUG is not set

# CONFIG_BCACHE_ASYNC_REGISTRATION is not set

CONFIG_BLK_DEV_DM_BUILTIN=y

CONFIG_BLK_DEV_DM=m

CONFIG_DM_DEBUG=y
@@ -8031,7 +8034,7 @@ CONFIG_CRC32_SLICEBY8=y 
# CONFIG_CRC32_SLICEBY4 is not set

# CONFIG_CRC32_SARWATE is not set

# CONFIG_CRC32_BIT is not set

# CONFIG_CRC64 is not set

CONFIG_CRC64=m

# CONFIG_CRC4 is not set

CONFIG_CRC7=m

CONFIG_LIBCRC32C=m

include/linux/sched.h

+6 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,7 @@ struct task_struct { 
#ifdef CONFIG_UPROBES

	struct uprobe_task		*utask;

#endif

#if defined(CONFIG_BCACHE) || defined(CONFIG_BCACHE_MODULE)

#if (defined(CONFIG_BCACHE) || defined(CONFIG_BCACHE_MODULE)) && !defined(CONFIG_X86)

	unsigned int			sequential_io;

	unsigned int			sequential_io_avg;

#endif
@@ -1435,8 +1435,13 @@ struct task_struct { 
	KABI_RESERVE(8)

	KABI_RESERVE(9)

#endif

#if (defined(CONFIG_BCACHE) || defined(CONFIG_BCACHE_MODULE)) && defined(CONFIG_X86)

	KABI_USE(10, unsigned int sequential_io)

	KABI_USE(11, unsigned int sequential_io_avg)

#else

	KABI_RESERVE(10)

	KABI_RESERVE(11)

#endif

	KABI_RESERVE(12)

	KABI_RESERVE(13)

	KABI_RESERVE(14)