Commit 374aeb91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'orphans-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull orphan section fixes from Kees Cook:
 "These two corner case fixes have been in -next for about a week:

   - Avoid orphan section in ARM cpuidle (Arnd Bergmann)

   - Avoid orphan section with !SMP (Nathan Chancellor)"

* tag 'orphans-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  vmlinux.lds.h: Avoid orphan section with !SMP
  ARM: cpuidle: Avoid orphan section warning
parents 591a22c1 d4c63999

arch/arm/include/asm/cpuidle.h

+3 −2
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ 
#ifdef CONFIG_CPU_IDLE

extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int index);

#define __cpuidle_method_section __used __section("__cpuidle_method_of_table")

#else

static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int index) { return -ENODEV; }

#define __cpuidle_method_section __maybe_unused /* drop silently */

#endif



/* Common ARM WFI state */
@@ -42,8 +44,7 @@ struct of_cpuidle_method { 


#define CPUIDLE_METHOD_OF_DECLARE(name, _method, _ops)			\

	static const struct of_cpuidle_method __cpuidle_method_of_table_##name \

	__used __section("__cpuidle_method_of_table")			\

	= { .method = _method, .ops = _ops }

	__cpuidle_method_section = { .method = _method, .ops = _ops }



extern int arm_cpuidle_suspend(int index);

include/asm-generic/vmlinux.lds.h

+1 −0
Original line number Diff line number Diff line
@@ -960,6 +960,7 @@ 
#ifdef CONFIG_AMD_MEM_ENCRYPT

#define PERCPU_DECRYPTED_SECTION					\

	. = ALIGN(PAGE_SIZE);						\

	*(.data..decrypted)						\

	*(.data..percpu..decrypted)					\

	. = ALIGN(PAGE_SIZE);

#else