Initial Contribution

msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/arch/arm/mach-msm/msm_kexec.c b/arch/arm/mach-msm/msm_kexec.c
new file mode 100644
index 0000000..4597cf0
--- /dev/null
+++ b/arch/arm/mach-msm/msm_kexec.c
@@ -0,0 +1,30 @@
+/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kexec.h>
+#include <linux/io.h>
+
+#ifdef CONFIG_MSM_WATCHDOG
+#include <mach/msm_iomap.h>
+
+#define WDT0_EN        (MSM_TMR_BASE + 0x40)
+#endif
+
+void arch_kexec(void)
+{
+#ifdef CONFIG_MSM_WATCHDOG
+	/* Prevent watchdog from resetting SoC */
+	writel(0, WDT0_EN);
+	pr_crit("KEXEC: MSM Watchdog Exit - Deactivated\n");
+#endif
+	return;
+}