diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-02-20 15:08:51 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-06 18:52:31 +0000 |
| commit | a26731d9d1e3fa93db0b5781d7e8dd9dbff1313e (patch) | |
| tree | 375d92e3c830c7024a5a3d4c3d2a3492c150e30e | |
| parent | f71016a8a8c5696530ec7173ee969c68e91d3719 (diff) | |
| download | lwn-a26731d9d1e3fa93db0b5781d7e8dd9dbff1313e.tar.gz lwn-a26731d9d1e3fa93db0b5781d7e8dd9dbff1313e.zip | |
arm64: Move show_unhandled_signals_ratelimited into traps.c
show_unhandled_signals_ratelimited is only called in traps.c, so move it
out of its macro in the dreaded system_misc.h and into a static function
in traps.c
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/arm64/include/asm/system_misc.h | 11 | ||||
| -rw-r--r-- | arch/arm64/kernel/traps.c | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h index 07aa8e3c5630..28893a0b141d 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -45,17 +45,6 @@ extern void __show_regs(struct pt_regs *); extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); -#define show_unhandled_signals_ratelimited() \ -({ \ - static DEFINE_RATELIMIT_STATE(_rs, \ - DEFAULT_RATELIMIT_INTERVAL, \ - DEFAULT_RATELIMIT_BURST); \ - bool __show_ratelimited = false; \ - if (show_unhandled_signals && __ratelimit(&_rs)) \ - __show_ratelimited = true; \ - __show_ratelimited; \ -}) - int handle_guest_sea(phys_addr_t addr, unsigned int esr); #endif /* __ASSEMBLY__ */ diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 835411cab38c..b139fe2d2126 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -223,6 +223,13 @@ void die(const char *str, struct pt_regs *regs, int err) do_exit(SIGSEGV); } +static bool show_unhandled_signals_ratelimited(void) +{ + static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL, + DEFAULT_RATELIMIT_BURST); + return show_unhandled_signals && __ratelimit(&rs); +} + void arm64_force_sig_info(struct siginfo *info, const char *str, struct task_struct *tsk) { |