Module Name: src
Committed By: cherry
Date: Wed Aug 10 06:33:13 UTC 2011
Modified Files:
src/sys/arch/amd64/include: frameasm.h
Log Message:
Correct offset calculation for ci
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/include/frameasm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/frameasm.h
diff -u src/sys/arch/amd64/include/frameasm.h:1.15 src/sys/arch/amd64/include/frameasm.h:1.16
--- src/sys/arch/amd64/include/frameasm.h:1.15 Wed Jan 12 23:12:11 2011
+++ src/sys/arch/amd64/include/frameasm.h Wed Aug 10 06:33:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.15 2011/01/12 23:12:11 joerg Exp $ */
+/* $NetBSD: frameasm.h,v 1.16 2011/08/10 06:33:13 cherry Exp $ */
#ifndef _AMD64_MACHINE_FRAMEASM_H
#define _AMD64_MACHINE_FRAMEASM_H
@@ -132,15 +132,13 @@
#ifdef XEN
#define CLI(temp_reg) \
- movl CPUVAR(CPUID),%e ## temp_reg ; \
- shlq $6,%r ## temp_reg ; \
- addq CPUVAR(VCPU),%r ## temp_reg ; \
- movb $1,EVTCHN_UPCALL_MASK(%r ## temp_reg)
+ movq CPUVAR(VCPU),%r ## temp_reg ; \
+ movb $1,EVTCHN_UPCALL_MASK(%r ## temp_reg);
+
#define STI(temp_reg) \
- movl CPUVAR(CPUID),%e ## temp_reg ; \
- shlq $6,%r ## temp_reg ; \
- addq CPUVAR(VCPU),%r ## temp_reg ; \
- movb $0,EVTCHN_UPCALL_MASK(%r ## temp_reg)
+ movq CPUVAR(VCPU),%r ## temp_reg ; \
+ movb $0,EVTCHN_UPCALL_MASK(%r ## temp_reg);
+
#else /* XEN */
#define CLI(temp_reg) cli
#define STI(temp_reg) sti
