hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/x86/kernel/pvclock.c
....@@ -1,18 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /* paravirtual clock -- common code used by kvm/xen
23
3
- This program is free software; you can redistribute it and/or modify
4
- it under the terms of the GNU General Public License as published by
5
- the Free Software Foundation; either version 2 of the License, or
6
- (at your option) any later version.
7
-
8
- This program is distributed in the hope that it will be useful,
9
- but WITHOUT ANY WARRANTY; without even the implied warranty of
10
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
- GNU General Public License for more details.
12
-
13
- You should have received a copy of the GNU General Public License
14
- along with this program; if not, write to the Free Software
15
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
164 */
175
186 #include <linux/clocksource.h>
....@@ -21,7 +9,7 @@
219 #include <linux/notifier.h>
2210 #include <linux/sched.h>
2311 #include <linux/gfp.h>
24
-#include <linux/bootmem.h>
12
+#include <linux/memblock.h>
2513 #include <linux/nmi.h>
2614
2715 #include <asm/fixmap.h>
....@@ -157,7 +145,7 @@
157145
158146 void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti)
159147 {
160
- WARN_ON(vclock_was_used(VCLOCK_PVCLOCK));
148
+ WARN_ON(vclock_was_used(VDSO_CLOCKMODE_PVCLOCK));
161149 pvti_cpu0_va = pvti;
162150 }
163151