From f6446a451caa5e0c4744bbec4dd8c1216b775773 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 6 Oct 2010 08:51:32 -0700 Subject: [PATCH] --- yaml --- r: 217835 b: refs/heads/master c: 9387377eb79a44f453fd27c3d00a2e5da587e369 h: refs/heads/master i: 217833: 0a5a13ce3bac5c6137dd7bf7b5d9354ec78b6bb1 217831: 610c591f84ccd4a390f19781a9c3866eb7fd045c v: v3 --- [refs] | 2 +- trunk/drivers/xen/xenfs/Makefile | 4 ++-- trunk/drivers/xen/xenfs/super.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b6940641779..0ade15ecf29b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de1ef2065c4675ab1062ebc8d1cb6c5f42b61d04 +refs/heads/master: 9387377eb79a44f453fd27c3d00a2e5da587e369 diff --git a/trunk/drivers/xen/xenfs/Makefile b/trunk/drivers/xen/xenfs/Makefile index 4a0be9a82af3..4fde9440fe1f 100644 --- a/trunk/drivers/xen/xenfs/Makefile +++ b/trunk/drivers/xen/xenfs/Makefile @@ -1,4 +1,4 @@ obj-$(CONFIG_XENFS) += xenfs.o -xenfs-y = super.o xenbus.o -xenfs-$(CONFIG_XEN_DOM0) += xenstored.o privcmd.o +xenfs-y = super.o xenbus.o privcmd.o +xenfs-$(CONFIG_XEN_DOM0) += xenstored.o diff --git a/trunk/drivers/xen/xenfs/super.c b/trunk/drivers/xen/xenfs/super.c index afaa6ede0168..984891e9a394 100644 --- a/trunk/drivers/xen/xenfs/super.c +++ b/trunk/drivers/xen/xenfs/super.c @@ -101,6 +101,7 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent) [1] = {}, { "xenbus", &xenbus_file_ops, S_IRUSR|S_IWUSR }, { "capabilities", &capabilities_file_ops, S_IRUGO }, + { "privcmd", &privcmd_file_ops, S_IRUSR|S_IWUSR }, {""}, }; int rc; @@ -114,8 +115,6 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent) &xsd_kva_file_ops, NULL, S_IRUSR|S_IWUSR); xenfs_create_file(sb, sb->s_root, "xsd_port", &xsd_port_file_ops, NULL, S_IRUSR|S_IWUSR); - xenfs_create_file(sb, sb->s_root, "privcmd", - &privcmd_file_ops, NULL, S_IRUSR|S_IWUSR); } return rc;