compile fixes

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 784cd7373662813da18df9920c6e95635c48b0bc..51d07fbe0d278f26850e0dac7c9958f4c659fba2 100644 (file)
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -21,7 +21,7 @@
        };
 
        chosen {
-                xen,dom0-bootargs = "console=hvc0,115200n8 debug root=/dev/mmcblk1 rw rootwait init=/bin/bash"; /*root=/dev/mmcblk0p4 */
+                xen,dom0-bootargs = "console=hvc0,115200n8 console=tty1 debug root=/dev/mmcblk0p7 rw rootwait init=/bin/bash"; /*root=/dev/mmcblk0p4 */
        };
 
        aliases {

diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index dbd1330c01966c20667853b6d9de97754b869d91..24710a3ad27d4bf0927a38256aaa1e5625e59af9 100644 (file)
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -32,6 +32,7 @@
 #include <xen/interface/xen.h>
 #include <xen/page.h>
 #include <xen/grant_table.h>
+#include <asm/errno.h>
 
 int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
                           unsigned long max_nr_gframes,

diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index b3e146edb51d947b3bb7d22b63e52fac32adcbc3..fc0cbbecba5566004e37b2e93955628ec2f3833a 100644 (file)
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
 #include <linux/export.h>
+#include <linux/mm.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/page.h>
 #include <xen/interface/xen.h>