svn commit: r303712 - in head/sys: amd64/amd64 conf i386/i386 x86/x86

[Konstantin Belousov]

Author: kib
Date: Wed Aug  3 13:51:53 2016
New Revision: 303712
URL: https://svnweb.freebsd.org/changeset/base/303712

Log:
  Merge i386 and amd64 variants of mp_watchdog.c into x86/, there is no
  difference between files.
  For pc98, put x86/mp_x86.c into the same place as used by i386 file list.
  Fix typo in comment.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Added:
  head/sys/x86/x86/mp_watchdog.c
     - copied, changed from r303711, head/sys/amd64/amd64/mp_watchdog.c
Deleted:
  head/sys/amd64/amd64/mp_watchdog.c
  head/sys/i386/i386/mp_watchdog.c
Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.pc98

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Aug  3 13:19:58 2016	(r303711)
+++ head/sys/conf/files.amd64	Wed Aug  3 13:51:53 2016	(r303712)
@@ -123,7 +123,6 @@ amd64/amd64/machdep.c		standard
 amd64/amd64/mem.c		optional	mem
 amd64/amd64/minidump_machdep.c	standard
 amd64/amd64/mp_machdep.c	optional	smp
-amd64/amd64/mp_watchdog.c	optional	mp_watchdog smp
 amd64/amd64/mpboot.S		optional	smp
 amd64/amd64/pmap.c		standard
 amd64/amd64/prof_machdep.c	optional	profiling-routine
@@ -621,6 +620,7 @@ x86/x86/mca.c			standard
 x86/x86/mptable.c		optional	mptable
 x86/x86/mptable_pci.c		optional	mptable pci
 x86/x86/mp_x86.c		optional	smp
+x86/x86/mp_watchdog.c		optional	mp_watchdog smp
 x86/x86/msi.c			optional	pci
 x86/x86/nexus.c			standard
 x86/x86/pvclock.c		standard

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Aug  3 13:19:58 2016	(r303711)
+++ head/sys/conf/files.i386	Wed Aug  3 13:51:53 2016	(r303712)
@@ -481,7 +481,6 @@ i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp
 i386/i386/mp_machdep.c		optional smp
-i386/i386/mp_watchdog.c		optional mp_watchdog smp
 i386/i386/mpboot.s		optional smp
 i386/i386/perfmon.c		optional perfmon
 i386/i386/pmap.c		standard
@@ -612,6 +611,7 @@ x86/x86/mca.c			standard
 x86/x86/mptable.c		optional apic
 x86/x86/mptable_pci.c		optional apic pci
 x86/x86/mp_x86.c		optional smp
+x86/x86/mp_watchdog.c		optional mp_watchdog smp
 x86/x86/msi.c			optional apic pci
 x86/x86/nexus.c			standard
 x86/x86/stack_machdep.c		optional ddb | stack

Modified: head/sys/conf/files.pc98
==============================================================================
--- head/sys/conf/files.pc98	Wed Aug  3 13:19:58 2016	(r303711)
+++ head/sys/conf/files.pc98	Wed Aug  3 13:51:53 2016	(r303712)
@@ -168,7 +168,6 @@ i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp
 i386/i386/mp_machdep.c		optional smp
-i386/i386/mp_watchdog.c		optional mp_watchdog smp
 i386/i386/mpboot.s		optional smp
 i386/i386/perfmon.c		optional perfmon
 i386/i386/pmap.c		standard
@@ -269,9 +268,10 @@ x86/x86/io_apic.c		optional apic
 x86/x86/legacy.c		standard
 x86/x86/local_apic.c		optional apic
 x86/x86/mca.c			standard
-x86/x86/mp_x86.c		optional smp
 x86/x86/mptable.c		optional apic
 x86/x86/mptable_pci.c		optional apic pci
+x86/x86/mp_x86.c		optional smp
+x86/x86/mp_watchdog.c		optional mp_watchdog smp
 x86/x86/msi.c			optional apic pci
 x86/x86/nexus.c			standard
 x86/x86/stack_machdep.c		optional ddb | stack

Copied and modified: head/sys/x86/x86/mp_watchdog.c (from r303711, head/sys/amd64/amd64/mp_watchdog.c)
==============================================================================
--- head/sys/amd64/amd64/mp_watchdog.c	Wed Aug  3 13:19:58 2016	(r303711, copy source)
+++ head/sys/x86/x86/mp_watchdog.c	Wed Aug  3 13:51:53 2016	(r303712)
@@ -92,7 +92,7 @@ watchdog_init(void *arg)
 
 /*
  * This callout resets a timer until the watchdog kicks in.  It acquires some
- * critical locks to make sure things haven't gotten wedged with hose locks
+ * critical locks to make sure things haven't gotten wedged with those locks
  * held.
  */
 static void