summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/delay.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-04-24 22:37:54 +0300
committerThomas Gleixner <tglx@linutronix.de>2020-05-07 17:06:19 +0300
commite8824890249355656968d8846908a313fe231f11 (patch)
tree1fcb79aee1fa6b82ee3810ce0b7ce0ee59d4ed23 /arch/x86/include/asm/delay.h
parent3c40cdb0e93ec166f1fa4fee1eb62d45b5451515 (diff)
downloadlinux-e8824890249355656968d8846908a313fe231f11.tar.xz
x86/delay: Preparatory code cleanup
The naming conventions in the delay code are confusing at best. All delay variants use a loops argument and or variable which originates from the original delay_loop() implementation. But all variants except delay_loop() are based on TSC cycles. Rename the argument to cycles and make it type u64 to avoid these weird expansions to u64 in the functions. Rename MWAITX_MAX_LOOPS to MWAITX_MAX_WAIT_CYCLES for the same reason and fixup the comment of delay_mwaitx() as well. Mark the delay_fn function pointer __ro_after_init and fixup the comment for it. No functional change and preparation for the upcoming TPAUSE based delay variant. [ Kyung Min Park: Added __init to use_tsc_delay() ] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Kyung Min Park <kyung.min.park@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/1587757076-30337-2-git-send-email-kyung.min.park@intel.com
Diffstat (limited to 'arch/x86/include/asm/delay.h')
-rw-r--r--arch/x86/include/asm/delay.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/delay.h b/arch/x86/include/asm/delay.h
index de9e7841f953..9aa38de7bd72 100644
--- a/arch/x86/include/asm/delay.h
+++ b/arch/x86/include/asm/delay.h
@@ -3,8 +3,9 @@
#define _ASM_X86_DELAY_H
#include <asm-generic/delay.h>
+#include <linux/init.h>
-void use_tsc_delay(void);
+void __init use_tsc_delay(void);
void use_mwaitx_delay(void);
#endif /* _ASM_X86_DELAY_H */