Skip to content

Commit 6e36a56

Browse files
jpoimboePeter Zijlstra
authored andcommitted
scsi: message: fusion: Mark mpt_halt_firmware() __noreturn
mpt_halt_firmware() doesn't return. Mark it as such. Fixes the following warnings: vmlinux.o: warning: objtool: mptscsih_abort+0x7f4: unreachable instruction vmlinux.o: warning: objtool: mptctl_timeout_expired+0x310: unreachable instruction Reported-by: kernel test robot <lkp@intel.com> Reported-by: Mark Rutland <mark.rutland@arm.com> Debugged-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/d8129817423422355bf30e90dadc6764261b53e0.1681342859.git.jpoimboe@kernel.org
1 parent 52668ba commit 6e36a56

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/message/fusion/mptbase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6935,7 +6935,7 @@ EXPORT_SYMBOL(mpt_clear_taskmgmt_in_progress_flag);
69356935
* @ioc: Pointer to MPT_ADAPTER structure
69366936
*
69376937
**/
6938-
void
6938+
void __noreturn
69396939
mpt_halt_firmware(MPT_ADAPTER *ioc)
69406940
{
69416941
u32 ioc_raw_state;

drivers/message/fusion/mptbase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ extern int mpt_raid_phys_disk_get_num_paths(MPT_ADAPTER *ioc,
945945
u8 phys_disk_num);
946946
extern int mpt_set_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc);
947947
extern void mpt_clear_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc);
948-
extern void mpt_halt_firmware(MPT_ADAPTER *ioc);
948+
extern void __noreturn mpt_halt_firmware(MPT_ADAPTER *ioc);
949949

950950

951951
/*

tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
219219
"lbug_with_loc",
220220
"machine_real_restart",
221221
"make_task_dead",
222+
"mpt_halt_firmware",
222223
"nmi_panic_self_stop",
223224
"panic",
224225
"panic_smp_self_stop",

0 commit comments

Comments
 (0)