diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /drivers/xen/xenfs/super.c | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'drivers/xen/xenfs/super.c')
| -rw-r--r-- | drivers/xen/xenfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c index 8924d93136f1..78bfab0700ba 100644 --- a/drivers/xen/xenfs/super.c +++ b/drivers/xen/xenfs/super.c | |||
| @@ -65,7 +65,7 @@ static struct file_system_type xenfs_type = { | |||
| 65 | 65 | ||
| 66 | static int __init xenfs_init(void) | 66 | static int __init xenfs_init(void) |
| 67 | { | 67 | { |
| 68 | if (xen_pv_domain()) | 68 | if (xen_domain()) |
| 69 | return register_filesystem(&xenfs_type); | 69 | return register_filesystem(&xenfs_type); |
| 70 | 70 | ||
| 71 | printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n"); | 71 | printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n"); |
| @@ -74,7 +74,7 @@ static int __init xenfs_init(void) | |||
| 74 | 74 | ||
| 75 | static void __exit xenfs_exit(void) | 75 | static void __exit xenfs_exit(void) |
| 76 | { | 76 | { |
| 77 | if (xen_pv_domain()) | 77 | if (xen_domain()) |
| 78 | unregister_filesystem(&xenfs_type); | 78 | unregister_filesystem(&xenfs_type); |
| 79 | } | 79 | } |
| 80 | 80 | ||