lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 093/158] kbuild: fix the modules order between drivers and libs
    Date
    From: Masahiro Yamada <masahiroy@kernel.org>

    commit 113147510b48e764e624e3d0e6707a1e48bc05a9 upstream.

    Commit b2c885549122 ("kbuild: update modules.order only when contained
    modules are updated") accidentally changed the modules order.

    Prior to that commit, the modules order was determined based on
    vmlinux-dirs, which lists core-y/m, drivers-y/m, libs-y/m, in this order.

    Now, subdir-modorder lists them in a different order: core-y/m, libs-y/m,
    drivers-y/m.

    Presumably, there was no practical issue because the modules in drivers
    and libs are orthogonal, but there is no reason to have this distortion.

    Get back to the original order.

    Fixes: b2c885549122 ("kbuild: update modules.order only when contained modules are updated")
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    Makefile | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -1133,13 +1133,11 @@ vmlinux-alldirs := $(sort $(vmlinux-dirs
    $(patsubst %/,%,$(filter %/, $(core-) \
    $(drivers-) $(libs-))))

    -subdir-modorder := $(addsuffix modules.order,$(filter %/, \
    - $(core-y) $(core-m) $(libs-y) $(libs-m) \
    - $(drivers-y) $(drivers-m)))
    -
    build-dirs := $(vmlinux-dirs)
    clean-dirs := $(vmlinux-alldirs)

    +subdir-modorder := $(addsuffix /modules.order, $(build-dirs))
    +
    # Externally visible symbols (used by link-vmlinux.sh)
    KBUILD_VMLINUX_OBJS := $(head-y) $(patsubst %/,%/built-in.a, $(core-y))
    KBUILD_VMLINUX_OBJS += $(addsuffix built-in.a, $(filter %/, $(libs-y)))

    \
     
     \ /
      Last update: 2022-08-23 14:20    [W:4.103 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site