Skip to content

Commit 60d33ed

Browse files
author
CKI KWF Bot
committed
Merge: objtool: update to v6.17
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7495 ``` JIRA: https://issues.redhat.com/browse/RHEL-114921 Backport objtool fixes and enhancements up to v6.17 Omitted-fix: 382094a ("powerpc: Fix 'intra_function_call not a direct call' warning") - cs-9 does not build the kernel with Power clang Omitted-fix: a47bc95 ("objtool/LoongArch: Get table size correctly if LTO is enabled") - cs-9 does not support LoongArch Omitted-fix: 06697ca ("objtool: Remove btrfs_assertfail() from the noreturn exceptions list") - cs-9 is missing upstream f372463 ("btrfs: mark btrfs_assertfail() __noreturn"), which added it to the noreturn exceptions list Omitted-fix: 1e4d73d ("crypto: powerpc: Mark ghashp8-ppc.o as an OBJECT_FILES_NON_STANDARD") - cs-9 isn't turning on objtool for PowerPC in this MR Omitted-fix: be8374a ("objtool: Fix standalone --hacks=jump_label") - cs-9 doesn't set CONFIG_HAVE_JUMP_LABEL_HACK Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> ``` Approved-by: Josh Poimboeuf <jpoimboe@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Jerome Marchand <jmarchan@redhat.com> Approved-by: Michael Petlan <mpetlan@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 1481889 + 8177f44 commit 60d33ed

File tree

105 files changed

+4100
-2351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+4100
-2351
lines changed

‎arch/alpha/kernel/process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void arch_cpu_idle(void)
5959
wtint(0);
6060
}
6161

62-
void arch_cpu_idle_dead(void)
62+
void __noreturn arch_cpu_idle_dead(void)
6363
{
6464
wtint(INT_MAX);
6565
}

‎arch/arm/kernel/smp.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu)
314314
* of the other hotplug-cpu capable cores, so presumably coming
315315
* out of idle fixes this.
316316
*/
317-
void arch_cpu_idle_dead(void)
317+
void __noreturn arch_cpu_idle_dead(void)
318318
{
319319
unsigned int cpu = smp_processor_id();
320320

@@ -373,6 +373,8 @@ void arch_cpu_idle_dead(void)
373373
" b secondary_start_kernel"
374374
:
375375
: "r" (task_stack_page(current) + THREAD_SIZE - 8));
376+
377+
unreachable();
376378
}
377379
#endif /* CONFIG_HOTPLUG_CPU */
378380

‎arch/arm64/include/asm/smp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static inline void arch_send_wakeup_ipi(unsigned int cpu)
100100
extern int __cpu_disable(void);
101101

102102
static inline void __cpu_die(unsigned int cpu) { }
103-
extern void cpu_die(void);
103+
extern void __noreturn cpu_die(void);
104104
extern void __noreturn cpu_die_early(void);
105105

106106
static inline void __noreturn cpu_park_loop(void)

‎arch/arm64/kernel/process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void (*pm_power_off)(void);
6969
EXPORT_SYMBOL_GPL(pm_power_off);
7070

7171
#ifdef CONFIG_HOTPLUG_CPU
72-
void arch_cpu_idle_dead(void)
72+
void __noreturn arch_cpu_idle_dead(void)
7373
{
7474
cpu_die();
7575
}

‎arch/arm64/kernel/smp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu)
373373
* Called from the idle thread for the CPU which has been shutdown.
374374
*
375375
*/
376-
void cpu_die(void)
376+
void __noreturn cpu_die(void)
377377
{
378378
unsigned int cpu = smp_processor_id();
379379
const struct cpu_operations *ops = get_cpu_ops(cpu);

‎arch/csky/kernel/smp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ void __cpu_die(unsigned int cpu)
302302
pr_notice("CPU%u: shutdown\n", cpu);
303303
}
304304

305-
void arch_cpu_idle_dead(void)
305+
void __noreturn arch_cpu_idle_dead(void)
306306
{
307307
idle_task_exit();
308308

‎arch/ia64/kernel/process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static inline void play_dead(void)
224224
}
225225
#endif /* CONFIG_HOTPLUG_CPU */
226226

227-
void arch_cpu_idle_dead(void)
227+
void __noreturn arch_cpu_idle_dead(void)
228228
{
229229
play_dead();
230230
}

‎arch/mips/include/asm/smp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static inline void __cpu_die(unsigned int cpu)
8888
mp_ops->cpu_die(cpu);
8989
}
9090

91-
extern void play_dead(void);
91+
extern void __noreturn play_dead(void);
9292
#endif
9393

9494
#ifdef CONFIG_KEXEC

‎arch/mips/kernel/process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <asm/stacktrace.h>
4141

4242
#ifdef CONFIG_HOTPLUG_CPU
43-
void arch_cpu_idle_dead(void)
43+
void __noreturn arch_cpu_idle_dead(void)
4444
{
4545
play_dead();
4646
}

‎arch/mips/kernel/smp-bmips.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,8 @@ void __ref play_dead(void)
413413
" wait\n"
414414
" j bmips_secondary_reentry\n"
415415
: : : "memory");
416+
417+
BUG();
416418
}
417419

418420
#endif /* CONFIG_HOTPLUG_CPU */

0 commit comments

Comments
 (0)