CVS commit: src/sys

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Mon Jun  9 13:03:16 UTC 2014

Modified Files:
        src/sys/net: pktqueue.c
        src/sys/rump/librump/rumpkern: intr.c

Log Message:
Restore the assert in RUMP's softint_schedule_cpu() and just ensure
curcpu() in the caller.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net/pktqueue.c
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/librump/rumpkern/intr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/pktqueue.c
diff -u src/sys/net/pktqueue.c:1.2 src/sys/net/pktqueue.c:1.3
--- src/sys/net/pktqueue.c:1.2	Mon Jun  9 12:57:04 2014
+++ src/sys/net/pktqueue.c	Mon Jun  9 13:03:16 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pktqueue.c,v 1.2 2014/06/09 12:57:04 rmind Exp $	*/
+/*	$NetBSD: pktqueue.c,v 1.3 2014/06/09 13:03:16 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.2 2014/06/09 12:57:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.3 2014/06/09 13:03:16 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -204,9 +204,9 @@ pktq_rps_hash(const struct mbuf *m __unu
  * => Returns false on failure; caller is responsible to free the packet.
  */
 bool
-pktq_enqueue(pktqueue_t *pq, struct mbuf *m, const u_int hash)
+pktq_enqueue(pktqueue_t *pq, struct mbuf *m, const u_int hash __unused)
 {
-	const unsigned cpuid = hash % ncpu;
+	const unsigned cpuid = curcpu()->ci_index /* hash % ncpu */;
 
 	KASSERT(kpreempt_disabled());
 

Index: src/sys/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.44 src/sys/rump/librump/rumpkern/intr.c:1.45
--- src/sys/rump/librump/rumpkern/intr.c:1.44	Sun Jun  8 15:24:34 2014
+++ src/sys/rump/librump/rumpkern/intr.c	Mon Jun  9 13:03:16 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.44 2014/06/08 15:24:34 rmind Exp $	*/
+/*	$NetBSD: intr.c,v 1.45 2014/06/09 13:03:16 rmind Exp $	*/
 
 /*
  * Copyright (c) 2008-2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.44 2014/06/08 15:24:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.45 2014/06/09 13:03:16 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -329,8 +329,8 @@ softint_schedule_cpu(void *arg, struct c
 {
 	/*
 	 * TODO: implement this properly
-	 * KASSERT(curcpu() == ci);
 	 */
+	KASSERT(curcpu() == ci);
 	softint_schedule(arg);
 }