diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-02 00:52:45 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-02 00:52:45 +0000 |
| commit | 3882a78594317ddcaeb97e585080a998ab8a17fe (patch) | |
| tree | 2d0182dc449cbd96e404e3b94f8964e393fd39f0 /xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c | |
| parent | 685d71bab181325dd4f5a5965314fa647fdf68a6 (diff) | |
| parent | f7a3ec9450a8f4aeb43bfa4ad65636325e756a61 (diff) | |
| download | xen-3882a78594317ddcaeb97e585080a998ab8a17fe.tar.gz xen-3882a78594317ddcaeb97e585080a998ab8a17fe.tar.bz2 xen-3882a78594317ddcaeb97e585080a998ab8a17fe.zip | |
bitkeeper revision 1.885 (4094465dmX2TefiJicy4taNzc0jiaw)
manual merge
Diffstat (limited to 'xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c')
| -rw-r--r-- | xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c index 4e507081be..98eff63453 100644 --- a/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c @@ -36,7 +36,7 @@ static struct proc_dir_entry *privcmd_intf; static int privcmd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data) { - int ret = 0; + int ret = -ENOSYS; switch ( cmd ) { @@ -108,6 +108,13 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, } break; + case IOCTL_PRIVCMD_INITDOMAIN_EVTCHN: + { + extern int initdom_ctrlif_domcontroller_port; + ret = initdom_ctrlif_domcontroller_port; + } + break; + default: ret = -EINVAL; break; @@ -140,7 +147,7 @@ static int __init init_module(void) { privcmd_intf->owner = THIS_MODULE; privcmd_intf->nlink = 1; - privcmd_intf->proc_fops = &privcmd_file_ops; + privcmd_intf->proc_fops = &privcmd_file_ops; } return 0; |