git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
x86_init.c
diff --git
a/arch/x86/kernel/x86_init.c
b/arch/x86/kernel/x86_init.c
index dad5fe9633a37e03215892c60386a779745fdb61..58b459296e13d007655e3ba8854d11832a535154 100644
(file)
--- a/
arch/x86/kernel/x86_init.c
+++ b/
arch/x86/kernel/x86_init.c
@@
-92,6
+92,7
@@
static void default_nmi_init(void) { };
static int default_i8042_detect(void) { return 1; };
struct x86_platform_ops x86_platform = {
+ .calibrate_cpu = native_calibrate_cpu,
.calibrate_tsc = native_calibrate_tsc,
.get_wallclock = mach_get_cmos_time,
.set_wallclock = mach_set_rtc_mmss,