HACK: chromebook with keyboard, trying to avoid SMP.

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index ce5c6337650a5fdbb94f559bc6568f7f64d4f482..551eb0f3a75d085df2dae79576443b227d2ce8c3 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 console=tty1 debug root=/dev/mmcblk0p7 rw rootwait init=/bin/bash"; /*root=/dev/mmcblk0p4 */
+                xen,dom0-bootargs = "console=tty1 debug root=/dev/mmcblk0p7 rw rootwait init=/bin/bash"; /*root=/dev/mmcblk0p4 */
        };
 
        aliases {

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index aa52699841879a36347ec8feafc76b289232739f..cf8c33bc50e53a498d38e079426a281407ef36b0 100644 (file)
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -732,6 +732,8 @@ void __cpuinit gic_secondary_init(unsigned int gic_nr)
 #ifdef CONFIG_SMP
 void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 {
+    printk("DEBUG %s %d, mask: %p, irq %d\n", __func__, __LINE__, *mask, irq);
+#if 0
        int cpu;
        unsigned long map = 0;
 
@@ -747,6 +749,7 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 
        /* this always happens on GIC0 */
        writel_relaxed(map << 16 | irq, gic_data_dist_base(&gic_data[0]) + GIC_DIST_SOFTINT);
+#endif
 }
 #endif
 

diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index 8a95cdb4c22e1dc0b544a19453e3bb6504c25f6d..eaa73187035fae988967d5a11f586364a45a75fe 100644 (file)
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -1871,7 +1871,7 @@ static struct clk_ops exynos5_vpll_ops = {
 };
 
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int exynos5_clock_suspend(void)
 {
        s3c_pm_do_save(exynos5_clock_save, ARRAY_SIZE(exynos5_clock_save));

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index ff8213d9a971ad058a6336c9ac7ac22928f6bb55..3b2272e9cd0671427928192a8121938ba31ab9eb 100644 (file)
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -89,6 +89,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
        unsigned long timeout;
+    printk("DEBUG %s %d, cpu %i\n", __func__, __LINE__, cpu);
 
        /*
         * Set synchronisation state between this boot processor
@@ -171,6 +172,7 @@ void __init smp_init_cpus(void)
        else
                ncores = scu_base ? scu_get_core_count(scu_base) : 1;
 
+        ncores = 1;
        /* sanity check */
        if (ncores > nr_cpu_ids) {
                pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index e673bc9357b89ef5659368641c3ccb5efaa37230..80bcfda3742c0f5e5af22d49ba630ce827119397 100644 (file)
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -330,7 +330,9 @@ static int __init ramoops_probe(struct platform_device *pdev)
 
        cxt->volatile_chunk.start = virt_to_phys(cxt->pstore.buf);
        cxt->volatile_chunk.num_bytes = cxt->pstore.bufsize;
+#ifdef CONFIG_PM_SLEEP
        pm_register_suspend_volatile(&cxt->volatile_chunk);
+#endif
 
        if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) {
                pr_err("request mem region failed\n");

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 2dec5b5cfb44b1effd6e2e80ad1c4554f5266984..860e447d832020c3f8473e9c9ce347531f730427 100644 (file)
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1082,7 +1082,7 @@ static struct iommu_ops exynos_iommu_ops = {
        .map = &exynos_iommu_map,
        .unmap = &exynos_iommu_unmap,
        .iova_to_phys = &exynos_iommu_iova_to_phys,
-       .pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
+       .pgsize_bitmap = SPAGE_SIZE,
 };
 
 static int __init exynos_iommu_init(void)

diff --git a/drivers/mfd/chromeos_ec_i2c.c b/drivers/mfd/chromeos_ec_i2c.c
index f1fe6e8cd7fd67bcba88b2951e2db02924d8b8b7..e3766ac06f5d1dc335b6e848299cce6568ce739e 100644 (file)
--- a/drivers/mfd/chromeos_ec_i2c.c
+++ b/drivers/mfd/chromeos_ec_i2c.c
@@ -21,6 +21,8 @@
  * battery charging and regulator control, firmware update.
  */
 
+/* #define DEBUG */
+/* #define VERBOSE_DEBUG */
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c.h>

diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index fdb6d229c9bbf5e59198189f95e70502116a6ca2..57db60cd35922997ea0b23d4c2c177dd13d7561c 100644 (file)
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/kobject.h>
+#include <linux/err.h>
 
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>

diff --git a/kernel/printk.c b/kernel/printk.c
index bd34ce753d26b6b51764b2cf058de56339be552f..52b754e0649cbb7965e28c3865e1e49685e4a6a1 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -774,6 +774,18 @@ asmlinkage int printk(const char *fmt, ...)
        r = vprintk(fmt, args);
        va_end(args);
 
+#if 1
+        {
+       static char buf[512];
+       va_list ap;
+
+       va_start(ap, fmt);
+       vsnprintf(buf, sizeof(buf), fmt, ap);
+       va_end(ap);
+
+       xen_raw_console_write(buf);
+        }
+#endif
        return r;
 #else
        static char buf[512];