svn commit: r207055 - user/jmallett/octeon/sys/mips/cavium/octe

[Juli Mallett]

Author: jmallett
Date: Thu Apr 22 06:58:59 2010
New Revision: 207055
URL: http://svn.freebsd.org/changeset/base/207055

Log:
  Use FreeBSD spelling of SMP option.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octe/ethernet-defines.h
  user/jmallett/octeon/sys/mips/cavium/octe/ethernet.c

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-defines.h
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-defines.h	Thu Apr 22 06:56:48 2010	(r207054)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-defines.h	Thu Apr 22 06:58:59 2010	(r207055)
@@ -100,7 +100,7 @@ AND WITH ALL FAULTS AND CAVIUM  NETWORKS
 #define MAX_RX_PACKETS 120 /* Maximum number of packets to process per interrupt. */
 #define MAX_OUT_QUEUE_DEPTH 1000
 
-#ifndef CONFIG_SMP
+#ifndef SMP
 #undef USE_MULTICORE_RECEIVE
 #define USE_MULTICORE_RECEIVE 0
 #endif

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet.c	Thu Apr 22 06:56:48 2010	(r207054)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet.c	Thu Apr 22 06:58:59 2010	(r207055)
@@ -182,7 +182,7 @@ static __init void cvm_oct_configure_com
 	/* Register an IRQ hander for to receive POW interrupts */
 	r = request_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group, cvm_oct_do_interrupt, IRQF_SHARED, "Ethernet", cvm_oct_device);
 
-#ifdef CONFIG_SMP
+#ifdef SMP
 	if (USE_MULTICORE_RECEIVE) {
 		preempt_disable();
 		{