8ef386092d
With 2.6.18-rc4-mm2, now wall_jiffies will always be the same as jiffies. So we can kill wall_jiffies completely. This is just a cleanup and logically should not change any real behavior except for one thing: RTC updating code in (old) ppc and xtensa use a condition "jiffies - wall_jiffies == 1". This condition is never met so I suppose it is just a bug. I just remove that condition only instead of kill the whole "if" block. [heiko.carstens@de.ibm.com: s390 build fix and cleanup] Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: Andi Kleen <ak@muc.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Ian Molton <spyro@f2s.com> Cc: Mikael Starvik <starvik@axis.com> Cc: David Howells <dhowells@redhat.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Hirokazu Takata <takata.hirokazu@renesas.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp> Cc: Richard Curnow <rc@rc0.org.uk> Cc: William Lee Irwin III <wli@holomorphy.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp> Cc: Chris Zankel <chris@zankel.net> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
69 lines
2 KiB
C
69 lines
2 KiB
C
#ifndef _ASM_X86_64_VSYSCALL_H_
|
|
#define _ASM_X86_64_VSYSCALL_H_
|
|
|
|
enum vsyscall_num {
|
|
__NR_vgettimeofday,
|
|
__NR_vtime,
|
|
__NR_vgetcpu,
|
|
};
|
|
|
|
#define VSYSCALL_START (-10UL << 20)
|
|
#define VSYSCALL_SIZE 1024
|
|
#define VSYSCALL_END (-2UL << 20)
|
|
#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
|
|
|
|
#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
|
|
|
|
#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 seqlock_t xtime_lock;
|
|
|
|
extern int sysctl_vsyscall;
|
|
|
|
extern void vsyscall_set_cpu(int cpu);
|
|
|
|
#define ARCH_HAVE_XTIME_LOCK 1
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_X86_64_VSYSCALL_H_ */
|