HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                *(.fixup)
                *(.gnu.warning)
 
                _stext = .;
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
                SOFTIRQENTRY_TEXT                                       \
                TEXT_TEXT                                               \
                SCHED_TEXT                                              \
-               CPUIDLE_TEXT                                            \
                LOCK_TEXT                                               \
                KPROBES_TEXT                                            \
                ARM_STUBS_TEXT                                          \
 
                        ENTRY_TEXT
                        TEXT_TEXT
                        SCHED_TEXT
-                       CPUIDLE_TEXT
                        LOCK_TEXT
                        KPROBES_TEXT
                        HYPERVISOR_TEXT
 
                SOFTIRQENTRY_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                *(.fixup)
 
                IRQENTRY_TEXT
                SOFTIRQENTRY_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                *(.fixup)
 
                __end_ivt_text = .;
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
        .text : {
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
                IRQENTRY_TEXT
                SOFTIRQENTRY_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                *(.fixup)
                . = ALIGN(16);
 
        IRQENTRY_TEXT
        SOFTIRQENTRY_TEXT
        SCHED_TEXT
-       CPUIDLE_TEXT
        LOCK_TEXT
        *(.fixup)
        *(.gnu.warning)
 
        IRQENTRY_TEXT
        SOFTIRQENTRY_TEXT
        SCHED_TEXT
-       CPUIDLE_TEXT
        LOCK_TEXT
        *(.fixup)
        *(.gnu.warning)
 
                EXIT_TEXT
                EXIT_CALL
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
        .text : {
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
        .text : {
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                IRQENTRY_TEXT
                SOFTIRQENTRY_TEXT
 
           _stext = .;
          TEXT_TEXT
          SCHED_TEXT
-         CPUIDLE_TEXT
          LOCK_TEXT
          KPROBES_TEXT
          IRQENTRY_TEXT
 
                TEXT_TEXT
                LOCK_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
                SOFTIRQENTRY_TEXT
 
 #endif
                NOINSTR_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
                _stext = .;
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                ENTRY_TEXT
 
                _stext = .;
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                ENTRY_TEXT
 
                HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
                HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
                HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
 
     _stext = .;
     TEXT_TEXT
     SCHED_TEXT
-    CPUIDLE_TEXT
     LOCK_TEXT
     IRQENTRY_TEXT
     SOFTIRQENTRY_TEXT
 
     _stext = .;
     TEXT_TEXT
     SCHED_TEXT
-    CPUIDLE_TEXT
     LOCK_TEXT
     IRQENTRY_TEXT
     SOFTIRQENTRY_TEXT
 
 
 #include <asm/nospec-branch.h>
 
-/* Provide __cpuidle; we can't safely include <linux/cpu.h> */
-#define __cpuidle __section(".cpuidle.text")
-
 /*
  * Interrupt control:
  */
        asm volatile("sti": : :"memory");
 }
 
-static inline __cpuidle void native_safe_halt(void)
+static __always_inline void native_safe_halt(void)
 {
        mds_idle_clear_cpu_buffers();
        asm volatile("sti; hlt": : :"memory");
 }
 
-static inline __cpuidle void native_halt(void)
+static __always_inline void native_halt(void)
 {
        mds_idle_clear_cpu_buffers();
        asm volatile("hlt": : :"memory");
  * Used in the idle loop; sti takes one instruction cycle
  * to complete:
  */
-static inline __cpuidle void arch_safe_halt(void)
+static __always_inline void arch_safe_halt(void)
 {
        native_safe_halt();
 }
  * Used when interrupts are already enabled or to
  * shutdown the processor:
  */
-static inline __cpuidle void halt(void)
+static __always_inline void halt(void)
 {
        native_halt();
 }
 
  * New with Core Duo processors, MWAIT can take some hints based on CPU
  * capability.
  */
-static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
+static __always_inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 {
        if (static_cpu_has_bug(X86_BUG_MONITOR) || !current_set_polling_and_test()) {
                if (static_cpu_has_bug(X86_BUG_CLFLUSH_MONITOR)) {
 
                HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
-               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                SOFTIRQENTRY_TEXT
 
     ENTRY_TEXT
     TEXT_TEXT
     SCHED_TEXT
-    CPUIDLE_TEXT
     LOCK_TEXT
     *(.fixup)
   }
 
                ALIGN_FUNCTION();                                       \
                __noinstr_text_start = .;                               \
                *(.noinstr.text)                                        \
+               __cpuidle_text_start = .;                               \
+               *(.cpuidle.text)                                        \
+               __cpuidle_text_end = .;                                 \
                __noinstr_text_end = .;
 
 /*
                *(.spinlock.text)                                       \
                __lock_text_end = .;
 
-#define CPUIDLE_TEXT                                                   \
-               ALIGN_FUNCTION();                                       \
-               __cpuidle_text_start = .;                               \
-               *(.cpuidle.text)                                        \
-               __cpuidle_text_end = .;
-
 #define KPROBES_TEXT                                                   \
                ALIGN_FUNCTION();                                       \
                __kprobes_text_start = .;                               \
 
 #endif
 
 /* Section for code which can't be instrumented at all */
-#define noinstr                                                                \
-       noinline notrace __attribute((__section__(".noinstr.text")))    \
+#define __noinstr_section(section)                                     \
+       noinline notrace __attribute((__section__(section)))            \
        __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage \
        __no_sanitize_memory
 
+#define noinstr __noinstr_section(".noinstr.text")
+
+#define __cpuidle __noinstr_section(".cpuidle.text")
+
 #endif /* __KERNEL__ */
 
 #endif /* __ASSEMBLY__ */
 
 
 void cpu_idle_poll_ctrl(bool enable);
 
-/* Attach to any functions which should be considered cpuidle. */
-#define __cpuidle      __section(".cpuidle.text")
-
 bool cpu_in_idle(unsigned long pc);
 
 void arch_cpu_idle(void);
 
 
                if (!strcmp(sec->name, ".noinstr.text") ||
                    !strcmp(sec->name, ".entry.text") ||
+                   !strcmp(sec->name, ".cpuidle.text") ||
                    !strncmp(sec->name, ".text.__x86.", 12))
                        sec->noinstr = true;
 
        if (func->sec->noinstr)
                return true;
 
+       /*
+        * If the symbol is a static_call trampoline, we can't tell.
+        */
+       if (func->static_call_tramp)
+               return true;
+
        /*
         * The __ubsan_handle_*() calls are like WARN(), they only happen when
         * something 'BAD' happened. At the risk of taking the machine down,
                warnings += validate_unwind_hints(file, sec);
        }
 
+       sec = find_section_by_name(file->elf, ".cpuidle.text");
+       if (sec) {
+               warnings += validate_section(file, sec);
+               warnings += validate_unwind_hints(file, sec);
+       }
+
        return warnings;
 }