summaryrefslogtreecommitdiffstats
path: root/init/calibrate.c
diff options
context:
space:
mode:
authorTakashi Iwai2014-09-03 16:57:41 +0200
committerTakashi Iwai2014-09-03 16:57:41 +0200
commit05244d166739ae273fdc7a2151bdef61df49ca7d (patch)
tree9065482d33f445c90f0b99d29aa51485d1d96488 /init/calibrate.c
parentALSA: hda - Fix COEF setups for ALC1150 codec (diff)
parentMerge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265', 'asoc/fix/d... (diff)
downloadkernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.gz
kernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.xz
kernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.zip
Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17 A few more driver specific fixes on top of the currently pending fixes (which are already in your tree but not Linus').
Diffstat (limited to 'init/calibrate.c')
-rw-r--r--init/calibrate.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/init/calibrate.c b/init/calibrate.c
index 520702db9acc..ce635dccf3d9 100644
--- 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();
}