svn commit: r359034 - head/sys/contrib/octeon-sdk

Alex Richardson arichardson at FreeBSD.org
Tue Mar 17 11:59:46 UTC 2020


Author: arichardson
Date: Tue Mar 17 11:59:45 2020
New Revision: 359034
URL: https://svnweb.freebsd.org/changeset/base/359034

Log:
  Fix misleading indentation warning in OCTEON1 kernel
  
  This is required to switch MIPS to compile with LLVM by default (D23204).
  
  Reviewed By:	brooks
  Differential Revision: https://reviews.freebsd.org/D24091

Modified:
  head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h

Modified: head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h	Tue Mar 17 11:59:40 2020	(r359033)
+++ head/sys/contrib/octeon-sdk/cvmx-dpi-defs.h	Tue Mar 17 11:59:45 2020	(r359034)
@@ -408,11 +408,12 @@ static inline uint64_t CVMX_DPI_SLI_PRTX_ERR(unsigned 
 		case OCTEON_CN68XX & OCTEON_FAMILY_MASK:
 
 			if (OCTEON_IS_MODEL(OCTEON_CN68XX_PASS1))
-			if ((offset <= 1))
-				return CVMX_ADD_IO_SEG(0x0001DF0000000928ull) + ((offset) & 1) * 8;
+				if ((offset <= 1))
+					return CVMX_ADD_IO_SEG(0x0001DF0000000928ull) + ((offset) & 1) * 8;
 			if (OCTEON_IS_MODEL(OCTEON_CN68XX_PASS2))
+				if ((offset <= 1))
+					return CVMX_ADD_IO_SEG(0x0001DF0000000920ull) + ((offset) & 1) * 8;
 			if ((offset <= 1))
-				return CVMX_ADD_IO_SEG(0x0001DF0000000920ull) + ((offset) & 1) * 8;			if ((offset <= 1))
 				return CVMX_ADD_IO_SEG(0x0001DF0000000920ull) + ((offset) & 1) * 8;
 			break;
 		case OCTEON_CN63XX & OCTEON_FAMILY_MASK:


More information about the svn-src-head mailing list