---

yaml --- r: 360982 b: refs/heads/master c: dc893e1 h: refs/heads/master v: v3
git-mirror · Mar 8, 2013 · 4c94629 · 4c94629
1 parent be72acf
commit 4c94629
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e1c9b2867656ff9a469d23e1dfe90cf77ec0c72
+refs/heads/master: dc893e19b5800d7743fb58235877bfa9091805ff
diff --git a/trunk/kernel/smpboot.c b/trunk/kernel/smpboot.c
@@ -131,7 +131,7 @@ static int smpboot_thread_fn(void *data)
 			continue;
 		}
 
-		//BUG_ON(td->cpu != smp_processor_id());
+		BUG_ON(td->cpu != smp_processor_id());
 
 		/* Check for state change setup */
 		switch (td->status) {

diff --git a/trunk/net/9p/trans_virtio.c b/trunk/net/9p/trans_virtio.c
@@ -655,7 +655,7 @@ static struct p9_trans_module p9_virtio_trans = {
 	.create = p9_virtio_create,
 	.close = p9_virtio_close,
 	.request = p9_virtio_request,
-	//.zc_request = p9_virtio_zc_request,
+	.zc_request = p9_virtio_zc_request,
 	.cancel = p9_virtio_cancel,
 	/*
 	 * We leave one entry for input and one entry for response