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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net
[pandora-kernel.git]
/
include
/
xen
/
privcmd.h
diff --git
a/include/xen/privcmd.h
b/include/xen/privcmd.h
index
b42cdfd
..
17857fb
100644
(file)
--- a/
include/xen/privcmd.h
+++ b/
include/xen/privcmd.h
@@
-34,13
+34,10
@@
#define __LINUX_PUBLIC_PRIVCMD_H__
#include <linux/types.h>
+#include <linux/compiler.h>
typedef unsigned long xen_pfn_t;
-#ifndef __user
-#define __user
-#endif
-
struct privcmd_hypercall {
__u64 op;
__u64 arg[5];