Commit 6d86b56f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8b817fde db3e33dd

kernel/module/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1521,14 +1521,14 @@ static void __layout_sections(struct module *mod, struct load_info *info, bool i 
		MOD_RODATA,

		MOD_RO_AFTER_INIT,

		MOD_DATA,

		MOD_INVALID,	/* This is needed to match the masks array */

		MOD_DATA,

	};

	static const int init_m_to_mem_type[] = {

		MOD_INIT_TEXT,

		MOD_INIT_RODATA,

		MOD_INVALID,

		MOD_INIT_DATA,

		MOD_INVALID,	/* This is needed to match the masks array */

		MOD_INIT_DATA,

	};



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