svn commit: r332758 - in stable/11/sys: amd64/amd64 i386/i386
Andriy Gapon
avg at FreeBSD.org
Thu Apr 19 06:18:22 UTC 2018
Author: avg
Date: Thu Apr 19 06:18:21 2018
New Revision: 332758
URL: https://svnweb.freebsd.org/changeset/base/332758
Log:
MFC r331875: x86 cpu_reset: if failed to switch to BSP proceed to cpu_reset_real
Modified:
stable/11/sys/amd64/amd64/vm_machdep.c
stable/11/sys/i386/i386/vm_machdep.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- stable/11/sys/amd64/amd64/vm_machdep.c Thu Apr 19 06:13:41 2018 (r332757)
+++ stable/11/sys/amd64/amd64/vm_machdep.c Thu Apr 19 06:18:21 2018 (r332758)
@@ -608,13 +608,14 @@ cpu_reset()
ia32_pause();
cnt++; /* Wait for BSP to announce restart */
}
- if (cpu_reset_proxy_active == 0)
+ if (cpu_reset_proxy_active == 0) {
printf("cpu_reset: Failed to restart BSP\n");
- cpu_reset_proxy_active = 2;
-
- while (1)
- ia32_pause();
- /* NOTREACHED */
+ } else {
+ cpu_reset_proxy_active = 2;
+ while (1)
+ ia32_pause();
+ /* NOTREACHED */
+ }
}
DELAY(1000000);
Modified: stable/11/sys/i386/i386/vm_machdep.c
==============================================================================
--- stable/11/sys/i386/i386/vm_machdep.c Thu Apr 19 06:13:41 2018 (r332757)
+++ stable/11/sys/i386/i386/vm_machdep.c Thu Apr 19 06:18:21 2018 (r332758)
@@ -640,13 +640,14 @@ cpu_reset()
ia32_pause();
cnt++; /* Wait for BSP to announce restart */
}
- if (cpu_reset_proxy_active == 0)
+ if (cpu_reset_proxy_active == 0) {
printf("cpu_reset: Failed to restart BSP\n");
- cpu_reset_proxy_active = 2;
-
- while (1)
- ia32_pause();
- /* NOTREACHED */
+ } else {
+ cpu_reset_proxy_active = 2;
+ while (1)
+ ia32_pause();
+ /* NOTREACHED */
+ }
}
DELAY(1000000);
More information about the svn-src-stable-11
mailing list