patch-2.4.21 linux-2.4.21/include/asm-x86_64/vsyscall.h

• Lines: 49
• Date: 2003-06-13 07:51:38.000000000 -0700
• Orig file: linux-2.4.20/include/asm-x86_64/vsyscall.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.20/include/asm-x86_64/vsyscall.h linux-2.4.21/include/asm-x86_64/vsyscall.h
@@ -15,29 +15,30 @@
 
 #ifdef __KERNEL__
 
-#define __section_hpet __attribute__ ((unused, __section__ (".hpet"), aligned(16)))
+#define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16)))
 #define __section_wall_jiffies __attribute__ ((unused, __section__ (".wall_jiffies"), aligned(16)))
 #define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
 #define __section_sys_tz __attribute__ ((unused, __section__ (".sys_tz"), aligned(16)))
 #define __section_xtime __attribute__ ((unused, __section__ (".xtime"), aligned(16)))
 #define __section_vxtime_sequence __attribute__ ((unused, __section__ (".vxtime_sequence"), aligned(16)))
 
-struct hpet_data {
-	long address;		/* base address */
-	unsigned long hz;	/* HPET clocks / sec */
-	int trigger;		/* value at last interrupt */
+struct vxtime_data {
+	long last_tsc;
+	long tsc_quot;
+	long quot;
 	int last;
-	int offset;
-	unsigned long last_tsc;
-	long ticks;
+	int mode;
 };
 
+#define VXTIME_TSC	1
+#define	VXTIME_HPET	2
+
 #define hpet_readl(a)           readl(fix_to_virt(FIX_HPET_BASE) + a)
 #define hpet_writel(d,a)        writel(d, fix_to_virt(FIX_HPET_BASE) + a)
 
 /* vsyscall space (readonly) */
 extern long __vxtime_sequence[2];
-extern struct hpet_data __hpet;
+extern struct vxtime_data __vxtime;
 extern struct timeval __xtime;
 extern volatile unsigned long __jiffies;
 extern unsigned long __wall_jiffies;
@@ -45,7 +46,7 @@
 
 /* kernel space (writeable) */
 extern long vxtime_sequence[2];
-extern struct hpet_data hpet;
+extern struct vxtime_data vxtime;
 extern unsigned long wall_jiffies;
 extern struct timezone sys_tz;