diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-01-24 16:33:19 +0000 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-01-24 16:33:19 +0000 |
commit | 46c01e0595e4292bb00d094f8526739a89480c84 (patch) | |
tree | afde510f6359e31bdec8b6758e1c7669d02eb2ef /xen/common/sysctl.c | |
parent | 16324b1affd81722aa3317eec67804329f943a2d (diff) | |
download | xen-46c01e0595e4292bb00d094f8526739a89480c84.tar.gz xen-46c01e0595e4292bb00d094f8526739a89480c84.tar.bz2 xen-46c01e0595e4292bb00d094f8526739a89480c84.zip |
Make domctl/sysctl interfaces 32-/64-bit invariant.
This kills off a fair amount of unpleasant CONFIG_COMPAT shimming and
avoids needing to keep the compat paths in sync as these interfaces
continue to develop.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/common/sysctl.c')
-rw-r--r-- | xen/common/sysctl.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 33a5108079..69c4d7a6ab 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -21,17 +21,12 @@ #include <asm/current.h> #include <public/sysctl.h> -#ifndef COMPAT -typedef long ret_t; -#define copy_to_xxx_offset copy_to_guest_offset -#endif - -extern ret_t arch_do_sysctl( +extern long arch_do_sysctl( struct xen_sysctl *op, XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl); -ret_t do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) +long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) { - ret_t ret = 0; + long ret = 0; struct xen_sysctl curop, *op = &curop; static DEFINE_SPINLOCK(sysctl_lock); @@ -101,8 +96,8 @@ ret_t do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) put_domain(d); - if ( copy_to_xxx_offset(op->u.getdomaininfolist.buffer, - num_domains, &info, 1) ) + if ( copy_to_guest_offset(op->u.getdomaininfolist.buffer, + num_domains, &info, 1) ) { ret = -EFAULT; break; |