diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/xen/evtchn.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/xen/evtchn.c')
| -rw-r--r-- | drivers/xen/evtchn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index 79bedba44fee..66e185cfe92f 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c | |||
| @@ -45,9 +45,10 @@ | |||
| 45 | #include <linux/poll.h> | 45 | #include <linux/poll.h> |
| 46 | #include <linux/irq.h> | 46 | #include <linux/irq.h> |
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/gfp.h> | ||
| 49 | #include <linux/mutex.h> | 48 | #include <linux/mutex.h> |
| 50 | #include <linux/cpu.h> | 49 | #include <linux/cpu.h> |
| 50 | |||
| 51 | #include <xen/xen.h> | ||
| 51 | #include <xen/events.h> | 52 | #include <xen/events.h> |
| 52 | #include <xen/evtchn.h> | 53 | #include <xen/evtchn.h> |
| 53 | #include <asm/xen/hypervisor.h> | 54 | #include <asm/xen/hypervisor.h> |