# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1187019607 -3600
# Node ID 4b6ffd020eb2a5212e575ce5464a3bbdb7974520
# Parent d423292c407d0652c1151dd61e361c404ecc0a59
[LINUX] hypercall: Handle hypcercall_stub as a macro
This patch handles the case where hypercall_stub is a macro. This
will happen under 2.4 when hypercalls are made from a module.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
---
include/asm-i386/mach-xen/asm/hypercall.h | 3 ++-
include/asm-x86_64/mach-xen/asm/hypercall.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -r d423292c407d -r 4b6ffd020eb2 include/asm-i386/mach-xen/asm/hypercall.h
--- a/include/asm-i386/mach-xen/asm/hypercall.h Mon Aug 13 16:33:35 2007 +0100
+++ b/include/asm-i386/mach-xen/asm/hypercall.h Mon Aug 13 16:40:07 2007 +0100
@@ -34,6 +34,7 @@
#define __HYPERCALL_H__
#include <linux/string.h> /* memcpy() */
+#include <linux/stringify.h>
#ifndef __HYPERVISOR_H__
# error "please don't include this file directly"
@@ -47,7 +48,7 @@
"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"
#else
#define HYPERCALL_STR(name) \
- "mov hypercall_stubs,%%eax; " \
+ "mov "__stringify(hypercall_stubs)",%%eax; " \
"add $("STR(__HYPERVISOR_##name)" * 32),%%eax; " \
"call *%%eax"
#endif
diff -r d423292c407d -r 4b6ffd020eb2 include/asm-x86_64/mach-xen/asm/hypercall.h
--- a/include/asm-x86_64/mach-xen/asm/hypercall.h Mon Aug 13 16:33:35
2007 +0100
+++ b/include/asm-x86_64/mach-xen/asm/hypercall.h Mon Aug 13 16:40:07
2007 +0100
@@ -38,6 +38,7 @@
#define __HYPERCALL_H__
#include <linux/string.h> /* memcpy() */
+#include <linux/stringify.h>
#ifndef __HYPERVISOR_H__
# error "please don't include this file directly"
@@ -51,7 +52,7 @@
"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"
#else
#define HYPERCALL_STR(name) \
- "mov hypercall_stubs,%%rax; " \
+ "mov "__stringify(hypercall_stubs)",%%rax; " \
"add $("STR(__HYPERVISOR_##name)" * 32),%%rax; " \
"call *%%rax"
#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home