Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c53b6a5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'next-fixes-20181012' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes 

Stephen writes:
  "A couple of warning fixes:

  Two fixes from Peter Oberparleiter <oberpar@linux.ibm.com>:
    Commit 6b7dca40 ("tracing: Allow gcov profiling on only ftrace subsystem")
   uncovered linker problems when using gcov kernel profiling on some
   architectures. These problems were likely introduced earlier, and are
   possibly related to compiler changes."

* tag 'next-fixes-20181012' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes:
  vmlinux.lds.h: Fix linker warnings about orphan .LPBX sections
  vmlinux.lds.h: Fix incomplete .text.exit discards
parents 90ad1841 52c8ee5b

arch/arm/kernel/vmlinux.lds.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define ARM_DISCARD							\

#define ARM_DISCARD							\

		*(.ARM.exidx.exit.text)					\

		*(.ARM.exidx.exit.text)					\

		*(.ARM.extab.exit.text)					\

		*(.ARM.extab.exit.text)					\

		*(.ARM.exidx.text.exit)					\

		*(.ARM.extab.text.exit)					\

		ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))		\

		ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))		\

		ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))		\

		ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))		\

		ARM_EXIT_DISCARD(EXIT_TEXT)				\

		ARM_EXIT_DISCARD(EXIT_TEXT)				\

include/asm-generic/vmlinux.lds.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ 
 */

 */

#ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

#ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

#define TEXT_MAIN .text .text.[0-9a-zA-Z_]*

#define TEXT_MAIN .text .text.[0-9a-zA-Z_]*

#define DATA_MAIN .data .data.[0-9a-zA-Z_]*

#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..LPBX*

#define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*

#define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*

#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]*

#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]*

#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]*

#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]*
@@ -613,8 +613,8 @@ 




#define EXIT_DATA							\

#define EXIT_DATA							\

	*(.exit.data .exit.data.*)					\

	*(.exit.data .exit.data.*)					\

	*(.fini_array)							\

	*(.fini_array .fini_array.*)					\

	*(.dtors)							\

	*(.dtors .dtors.*)						\

	MEM_DISCARD(exit.data*)						\

	MEM_DISCARD(exit.data*)						\

	MEM_DISCARD(exit.rodata*)

	MEM_DISCARD(exit.rodata*)