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 /arch/x86/xen/debugfs.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/xen/debugfs.c')
| -rw-r--r-- | arch/x86/xen/debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/debugfs.c b/arch/x86/xen/debugfs.c index 1304bcec8ee5..7c0fedd98ea0 100644 --- a/arch/x86/xen/debugfs.c +++ b/arch/x86/xen/debugfs.c | |||
| @@ -106,6 +106,7 @@ static const struct file_operations u32_array_fops = { | |||
| 106 | .open = u32_array_open, | 106 | .open = u32_array_open, |
| 107 | .release= xen_array_release, | 107 | .release= xen_array_release, |
| 108 | .read = u32_array_read, | 108 | .read = u32_array_read, |
| 109 | .llseek = no_llseek, | ||
| 109 | }; | 110 | }; |
| 110 | 111 | ||
| 111 | struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode, | 112 | struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode, |