]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
um: Avoid redefining ARCH_HAS_CACHE_LINE_SIZE
authorTiwei Bie <tiwei.btw@antgroup.com>
Tue, 8 Jul 2025 09:04:02 +0000 (17:04 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 11 Jul 2025 06:49:18 +0000 (08:49 +0200)
There is a generic ARCH_HAS_CACHE_LINE_SIZE option introduced by
commit c2280be81de4 ("mm: generalize ARCH_HAS_CACHE_LINE_SIZE")
in mm/Kconfig. Select that instead.

Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250708090403.1067440-4-tiwei.bie@linux.dev
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
arch/um/Kconfig

index c2d2d2d99bbe3f5a5dc4afaa69e02a520e326c2d..9083bfdb77350d799e3c5e036e41a8dff553280a 100644 (file)
@@ -6,6 +6,7 @@ config UML
        bool
        default y
        select ARCH_WANTS_DYNAMIC_TASK_STRUCT
+       select ARCH_HAS_CACHE_LINE_SIZE
        select ARCH_HAS_CPU_FINALIZE_INIT
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_GCOV_PROFILE_ALL
@@ -83,9 +84,6 @@ config NR_CPUS
        range 1 1
        default 1
 
-config ARCH_HAS_CACHE_LINE_SIZE
-       def_bool y
-
 source "arch/$(HEADER_ARCH)/um/Kconfig"
 
 config MAY_HAVE_RUNTIME_DEPS