diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 11323cdc33014d7be4ffb98b86e8fce77704a594..034b3820535c2a6ae927f015497b70c22861c95c 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -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 @@ -8029,7 +8032,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 diff --git a/include/linux/sched.h b/include/linux/sched.h index 6abf68d8f1b892ff10585db5a82f82c0b7637e28..3b8f72bf0c6bb049022bc297aaebd9e412b9c4a1 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -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)