Commit abe81e25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull more relocation fixes from Peter Anvin:
 "These are additional symbols that have been found to either be
  absolute or look like they might end up being absolute on one version
  of GNU ld or another.  Unfortunately we have since that a different
  GNU ld version, 2.21, can generate bogus absolute symbols; again, this
  would have caused a malfunctioning kernel on x86-32 if relocated.

  The relocs.c changes changed silent corruption to a build time error.

  It is worth noting that if the various barrier symbols we use were
  more consistent in the namespace used this probably could be reduced
  to a single regexp; if nothing else it looks like there is migration
  toward a common __(start|stop)___.* namespace."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: Add jiffies and jiffies_64 to the relative whitelist
  x86-32, relocs: Whitelist more symbols for ld bug workaround
parents b1bf7d4d ea17e741

arch/x86/tools/relocs.c

+12 −0
Original line number Diff line number Diff line
@@ -60,6 +60,18 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { 
	"__x86_cpu_dev_(start|end)|"

	"(__parainstructions|__alt_instructions)(|_end)|"

	"(__iommu_table|__apicdrivers|__smp_locks)(|_end)|"

	"__(start|end)_pci_.*|"

	"__(start|end)_builtin_fw|"

	"__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl|_gpl_future)|"

	"__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl|_gpl_future)|"

	"__(start|stop)___param|"

	"__(start|stop)___modver|"

	"__(start|stop)___bug_table|"

	"__tracedata_(start|end)|"

	"__(start|stop)_notes|"

	"__end_rodata|"

	"__initramfs_start|"

	"(jiffies|jiffies_64)|"

	"_end)$"

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE