diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/xen/xenfs/xenfs.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/xen/xenfs/xenfs.h')
| -rw-r--r-- | drivers/xen/xenfs/xenfs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/xenfs/xenfs.h b/drivers/xen/xenfs/xenfs.h index 51f08b2d0bf1..b68aa6200003 100644 --- a/drivers/xen/xenfs/xenfs.h +++ b/drivers/xen/xenfs/xenfs.h | |||
| @@ -2,5 +2,8 @@ | |||
| 2 | #define _XENFS_XENBUS_H | 2 | #define _XENFS_XENBUS_H |
| 3 | 3 | ||
| 4 | extern const struct file_operations xenbus_file_ops; | 4 | extern const struct file_operations xenbus_file_ops; |
| 5 | extern const struct file_operations privcmd_file_ops; | ||
| 6 | extern const struct file_operations xsd_kva_file_ops; | ||
| 7 | extern const struct file_operations xsd_port_file_ops; | ||
| 5 | 8 | ||
| 6 | #endif /* _XENFS_XENBUS_H */ | 9 | #endif /* _XENFS_XENBUS_H */ |