Merge remote-tracking branch 'security/next'

[karo-tx-linux.git] / init / calibrate.c

diff --git a/init/calibrate.c b/init/calibrate.c
index 520702db9accd25ff2e66579bfee4d231d5fa0e4..ce635dccf3d96921249a2e20084d9f67b5361b33 100644 (file)
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -262,6 +262,15 @@ unsigned long __attribute__((weak)) calibrate_delay_is_known(void)
        return 0;
 }
 
+/*
+ * Indicate the cpu delay calibration is done. This can be used by
+ * architectures to stop accepting delay timer registrations after this point.
+ */
+
+void __attribute__((weak)) calibration_delay_done(void)
+{
+}
+
 void calibrate_delay(void)
 {
        unsigned long lpj;
@@ -301,4 +310,6 @@ void calibrate_delay(void)
 
        loops_per_jiffy = lpj;
        printed = true;
+
+       calibration_delay_done();
 }