From: Erik van der Kouwe <erik@minix3.org>
Date: Wed, 22 Jun 2011 15:56:57 +0000 (+0200)
Subject: Initialize NMI watchdog only once, after enabling paging
X-Git-Tag: v3.2.0~531
X-Git-Url: http://zhaoyanbai.com/repos/man.rndc.html?a=commitdiff_plain;h=35b203fdb1c81dc4c804fcda5e1e8a8513cb3e37;p=minix.git

Initialize NMI watchdog only once, after enabling paging
---

diff --git a/kernel/main.c b/kernel/main.c
index cd6eedd2d..e7d767e96 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -76,17 +76,6 @@ PUBLIC void bsp_finish_booting(void)
 
   fpu_init();
 
-#ifdef CONFIG_WATCHDOG
-  if (watchdog_enabled) {
-	  if (arch_watchdog_init()) {
-		  printf("WARNING watchdog initialization failed! Disabled\n");
-		  watchdog_enabled = 0;
-	  }
-	  else
-		  BOOT_VERBOSE(printf("Watchdog enabled\n"););
-  }
-#endif
-
 /* Warnings for sanity checks that take time. These warnings are printed
  * so it's a clear warning no full release should be done with them
  * enabled.