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 /net/nonet.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 'net/nonet.c')
| -rw-r--r-- | net/nonet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nonet.c b/net/nonet.c index 92e76640c7cd..b1a73fda9c12 100644 --- a/net/nonet.c +++ b/net/nonet.c | |||
| @@ -22,4 +22,5 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare) | |||
| 22 | const struct file_operations bad_sock_fops = { | 22 | const struct file_operations bad_sock_fops = { |
| 23 | .owner = THIS_MODULE, | 23 | .owner = THIS_MODULE, |
| 24 | .open = sock_no_open, | 24 | .open = sock_no_open, |
| 25 | .llseek = noop_llseek, | ||
| 25 | }; | 26 | }; |