From 4c946294b1debb8c28109689944b3c5f5749cd6e Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 8 Mar 2013 12:43:31 -0800 Subject: [PATCH] --- yaml --- r: 360982 b: refs/heads/master c: dc893e19b5800d7743fb58235877bfa9091805ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/smpboot.c | 2 +- trunk/net/9p/trans_virtio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f3da6231100..8a69b0aa4921 100644 --- 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 index 25d3d8b6e4e1..8eaed9aa9cf0 100644 --- 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 index 74dea377fe5b..de2e950a0a7a 100644 --- 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