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

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

x86_64/vdso: Remove jiffies from the vvar page 



I think that the jiffies vvar was once used for the vgetcpu
cache. That code is long gone, so let's just make jiffies be a
normal variable.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/fcfee6f8749af14d96373a9e2656354ad0b95499.1411494540.git.luto@amacapital.net


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

arch/x86/include/asm/vvar.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ extern char __vvar_page; 


/* DECLARE_VVAR(offset, type, name) */



DECLARE_VVAR(0, volatile unsigned long, jiffies)

DECLARE_VVAR(16, int, vgetcpu_mode)

DECLARE_VVAR(128, struct vsyscall_gtod_data, vsyscall_gtod_data)

arch/x86/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/time.h>



#ifdef CONFIG_X86_64

__visible DEFINE_VVAR(volatile unsigned long, jiffies) = INITIAL_JIFFIES;

__visible volatile unsigned long jiffies __cacheline_aligned = INITIAL_JIFFIES;

#endif



unsigned long profile_pc(struct pt_regs *regs)

arch/x86/vdso/vgetcpu.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include <linux/kernel.h>

#include <linux/getcpu.h>

#include <linux/jiffies.h>

#include <linux/time.h>

#include <asm/vsyscall.h>

#include <asm/vgtod.h>