git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xen/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
[pandora-kernel.git]
/
drivers
/
xen
/
xenfs
/
xenbus.c
diff --git
a/drivers/xen/xenfs/xenbus.c
b/drivers/xen/xenfs/xenbus.c
index
8f6c7d4
..
bbd000f
100644
(file)
--- a/
drivers/xen/xenfs/xenbus.c
+++ b/
drivers/xen/xenfs/xenbus.c
@@
-43,6
+43,7
@@
#include <linux/fs.h>
#include <linux/poll.h>
#include <linux/mutex.h>
#include <linux/fs.h>
#include <linux/poll.h>
#include <linux/mutex.h>
+#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/mount.h>
#include <linux/pagemap.h>
#include <linux/spinlock.h>
#include <linux/mount.h>
#include <linux/pagemap.h>
@@
-50,6
+51,7
@@
#include <linux/init.h>
#include <linux/namei.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/namei.h>
#include <linux/string.h>
+#include <linux/slab.h>
#include "xenfs.h"
#include "../xenbus/xenbus_comms.h"
#include "xenfs.h"
#include "../xenbus/xenbus_comms.h"
@@
-587,4
+589,5
@@
const struct file_operations xenbus_file_ops = {
.open = xenbus_file_open,
.release = xenbus_file_release,
.poll = xenbus_file_poll,
.open = xenbus_file_open,
.release = xenbus_file_release,
.poll = xenbus_file_poll,
+ .llseek = no_llseek,
};
};