svn commit: r363676 - stable/12/sys/kern

[Brooks Davis]

Author: brooks
Date: Wed Jul 29 22:10:25 2020
New Revision: 363676
URL: https://svnweb.freebsd.org/changeset/base/363676

Log:
  MFC r363438:
  
  Use SI_ORDER_(FOURTH|FIFTH) rather than bespoke versions.
  
  No functional change.
  
  When these SYSINITs were added these macros didn't exist.
  
  Reviewed by:	imp
  Obtained from:	CheriBSD
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D25758

Modified:
  stable/12/sys/kern/init_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/init_main.c
==============================================================================
--- stable/12/sys/kern/init_main.c	Wed Jul 29 22:08:54 2020	(r363675)
+++ stable/12/sys/kern/init_main.c	Wed Jul 29 22:10:25 2020	(r363676)
@@ -367,18 +367,18 @@ SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, pri
 #ifdef WITNESS
 static char wit_warn[] =
      "WARNING: WITNESS option enabled, expect reduced performance.\n";
-SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 1,
+SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_FOURTH,
    print_caddr_t, wit_warn);
-SYSINIT(witwarn2, SI_SUB_LAST, SI_ORDER_THIRD + 1,
+SYSINIT(witwarn2, SI_SUB_LAST, SI_ORDER_FOURTH,
    print_caddr_t, wit_warn);
 #endif
 
 #ifdef DIAGNOSTIC
 static char diag_warn[] =
      "WARNING: DIAGNOSTIC option enabled, expect reduced performance.\n";
-SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 2,
+SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_FIFTH,
     print_caddr_t, diag_warn);
-SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_THIRD + 2,
+SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_FIFTH,
     print_caddr_t, diag_warn);
 #endif