Skip to content

Commit 6d86b56

Browse files
committed
Merge tag 'modules-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull modules fix from Luis Chamberlain: "A fix is provided for ia64. Even though ia64 is on life support it helps to fix issues if we can. Thanks to Linus for doing tons of the ia64 debugging" * tag 'modules-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux: module: fix module load for ia64
2 parents 8b817fd + db3e33d commit 6d86b56

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/module/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,14 +1521,14 @@ static void __layout_sections(struct module *mod, struct load_info *info, bool i
15211521
MOD_RODATA,
15221522
MOD_RO_AFTER_INIT,
15231523
MOD_DATA,
1524-
MOD_INVALID, /* This is needed to match the masks array */
1524+
MOD_DATA,
15251525
};
15261526
static const int init_m_to_mem_type[] = {
15271527
MOD_INIT_TEXT,
15281528
MOD_INIT_RODATA,
15291529
MOD_INVALID,
15301530
MOD_INIT_DATA,
1531-
MOD_INVALID, /* This is needed to match the masks array */
1531+
MOD_INIT_DATA,
15321532
};
15331533

15341534
for (m = 0; m < ARRAY_SIZE(masks); ++m) {

0 commit comments

Comments
 (0)