[PATCH] time: x86_64: re-enable vsyscall support for x86_64
Cleanup and re-enable vsyscall gettimeofday using the generic clocksource infrastructure. [akpm@osdl.org: cleanup] Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andi Kleen <ak@muc.de> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
1489939f0a
commit
7460ed2844
@@ -45,9 +45,7 @@ extern u32 pmtmr_ioport;
|
||||
#else
|
||||
#define pmtmr_ioport 0
|
||||
#endif
|
||||
extern int sysctl_vsyscall;
|
||||
extern int nohpet;
|
||||
extern unsigned long vxtime_hz;
|
||||
|
||||
extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ extern int read_current_timer(unsigned long *timer_value);
|
||||
#define NS_SCALE 10 /* 2^10, carefully chosen */
|
||||
#define US_SCALE 32 /* 2^32, arbitralrily chosen */
|
||||
|
||||
extern struct vxtime_data vxtime;
|
||||
extern void mark_tsc_unstable(void);
|
||||
extern void set_cyc2ns_scale(unsigned long khz);
|
||||
#endif
|
||||
|
||||
@@ -16,46 +16,27 @@ enum vsyscall_num {
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/seqlock.h>
|
||||
|
||||
#define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16)))
|
||||
#define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
|
||||
#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
|
||||
#define __section_sys_tz __attribute__ ((unused, __section__ (".sys_tz"), aligned(16)))
|
||||
#define __section_sysctl_vsyscall __attribute__ ((unused, __section__ (".sysctl_vsyscall"), aligned(16)))
|
||||
#define __section_xtime __attribute__ ((unused, __section__ (".xtime"), aligned(16)))
|
||||
#define __section_xtime_lock __attribute__ ((unused, __section__ (".xtime_lock"), aligned(16)))
|
||||
|
||||
#define VXTIME_TSC 1
|
||||
#define VXTIME_HPET 2
|
||||
#define VXTIME_PMTMR 3
|
||||
/* Definitions for CONFIG_GENERIC_TIME definitions */
|
||||
#define __section_vsyscall_gtod_data __attribute__ \
|
||||
((unused, __section__ (".vsyscall_gtod_data"),aligned(16)))
|
||||
#define __vsyscall_fn __attribute__ ((unused,__section__(".vsyscall_fn")))
|
||||
|
||||
#define VGETCPU_RDTSCP 1
|
||||
#define VGETCPU_LSL 2
|
||||
|
||||
struct vxtime_data {
|
||||
long hpet_address; /* HPET base address */
|
||||
int last;
|
||||
unsigned long last_tsc;
|
||||
long quot;
|
||||
long tsc_quot;
|
||||
int mode;
|
||||
};
|
||||
|
||||
#define hpet_readl(a) readl((const void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
|
||||
#define hpet_writel(d,a) writel(d, (void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
|
||||
|
||||
/* vsyscall space (readonly) */
|
||||
extern struct vxtime_data __vxtime;
|
||||
extern int __vgetcpu_mode;
|
||||
extern struct timespec __xtime;
|
||||
extern volatile unsigned long __jiffies;
|
||||
extern struct timezone __sys_tz;
|
||||
extern seqlock_t __xtime_lock;
|
||||
|
||||
/* kernel space (writeable) */
|
||||
extern struct vxtime_data vxtime;
|
||||
extern int vgetcpu_mode;
|
||||
extern struct timezone sys_tz;
|
||||
extern int sysctl_vsyscall;
|
||||
extern struct vsyscall_gtod_data_t vsyscall_gtod_data;
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user