ARM: 7829/1: Add ".text.unlikely" and ".text.hot" to arm unwind tables (849b882b) · Commits · 戴 / test

It appears that gcc may put some code in ".text.unlikely" or ".text.hot" sections. Right now those aren't accounted for in unwind tables. Add them. I found some docs about this at: http://gcc.gnu.org/onlinedocs/gcc-4.6.2/gcc.pdf Without this, if you have slub_debug turned on, you can get messages that look like this: unwind: Index not found 7f008c50 Signed-off-by:

Doug Anderson <dianders@chromium.org> Acked-by:

Mike Frysinger <vapier@gentoo.org> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/include/asm/module.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ enum {
		ARM_SEC_CORE,
		ARM_SEC_EXIT,
		ARM_SEC_DEVEXIT,
		ARM_SEC_HOT,
		ARM_SEC_UNLIKELY,
		ARM_SEC_MAX,
		};

arch/arm/kernel/module.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -292,12 +292,20 @@ int module_finalize(const Elf32_Ehdr hdr, const Elf_Shdr sechdrs,
		maps[ARM_SEC_CORE].unw_sec = s;
		else if (strcmp(".ARM.exidx.exit.text", secname) == 0)
		maps[ARM_SEC_EXIT].unw_sec = s;
		else if (strcmp(".ARM.exidx.text.unlikely", secname) == 0)
		maps[ARM_SEC_UNLIKELY].unw_sec = s;
		else if (strcmp(".ARM.exidx.text.hot", secname) == 0)
		maps[ARM_SEC_HOT].unw_sec = s;
		else if (strcmp(".init.text", secname) == 0)
		maps[ARM_SEC_INIT].txt_sec = s;
		else if (strcmp(".text", secname) == 0)
		maps[ARM_SEC_CORE].txt_sec = s;
		else if (strcmp(".exit.text", secname) == 0)
		maps[ARM_SEC_EXIT].txt_sec = s;
		else if (strcmp(".text.unlikely", secname) == 0)
		maps[ARM_SEC_UNLIKELY].txt_sec = s;
		else if (strcmp(".text.hot", secname) == 0)
		maps[ARM_SEC_HOT].txt_sec = s;
		}

		for (i = 0; i < ARM_SEC_MAX; i++)

Admin message