Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc1e24fd authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/vdso: Remove pvclock fixmap machinery 



Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/4933029991103ae44672c82b97a20035f5c1fe4f.1449702533.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dac16fba

arch/x86/entry/vdso/vclock_gettime.c

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern u8 pvclock_page 


#include <linux/kernel.h>

#include <asm/vsyscall.h>

#include <asm/fixmap.h>

#include <asm/pvclock.h>



notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)

arch/x86/entry/vdso/vma.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/random.h>

#include <linux/elf.h>

#include <linux/cpu.h>

#include <asm/pvclock.h>

#include <asm/vgtod.h>

#include <asm/proto.h>

#include <asm/vdso.h>

arch/x86/include/asm/fixmap.h

+0 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/acpi.h>

#include <asm/apicdef.h>

#include <asm/page.h>

#include <asm/pvclock.h>

#ifdef CONFIG_X86_32

#include <linux/threads.h>

#include <asm/kmap_types.h>
@@ -72,10 +71,6 @@ enum fixed_addresses { 
#ifdef CONFIG_X86_VSYSCALL_EMULATION

	VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT,

#endif

#ifdef CONFIG_PARAVIRT_CLOCK

	PVCLOCK_FIXMAP_BEGIN,

	PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1,

#endif

#endif

	FIX_DBGP_BASE,

	FIX_EARLYCON_MEM_BASE,

arch/x86/include/asm/pvclock.h

+0 −5
Original line number Diff line number Diff line
@@ -100,10 +100,5 @@ struct pvclock_vsyscall_time_info { 
} __attribute__((__aligned__(SMP_CACHE_BYTES)));



#define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info)

#define PVCLOCK_VSYSCALL_NR_PAGES (((NR_CPUS-1)/(PAGE_SIZE/PVTI_SIZE))+1)



int __init pvclock_init_vsyscall(struct pvclock_vsyscall_time_info *i,

				 int size);

struct pvclock_vcpu_time_info *pvclock_get_vsyscall_time_info(int cpu);



#endif /* _ASM_X86_PVCLOCK_H */

arch/x86/kernel/kvmclock.c

+0 −6
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ int __init kvm_setup_vsyscall_timeinfo(void) 
{

#ifdef CONFIG_X86_64

	int cpu;

	int ret;

	u8 flags;

	struct pvclock_vcpu_time_info *vcpu_time;

	unsigned int size;
@@ -330,11 +329,6 @@ int __init kvm_setup_vsyscall_timeinfo(void) 
		return 1;

	}



	if ((ret = pvclock_init_vsyscall(hv_clock, size))) {

		put_cpu();

		return ret;

	}



	put_cpu();



	kvm_clock.archdata.vclock_mode = VCLOCK_PVCLOCK;