aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-08 12:43:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-08 15:05:34 -0800
commitdc893e19b5800d7743fb58235877bfa9091805ff (patch)
tree56d2de512a83e9883dace8f4a6be26eddddfa6f7
parent2e1c9b2867656ff9a469d23e1dfe90cf77ec0c72 (diff)
downloadvexpress-lsk-dc893e19b5800d7743fb58235877bfa9091805ff.tar.gz
Revert parts of "hlist: drop the node parameter from iterators"
Commit b67bfe0d42ca ("hlist: drop the node parameter from iterators") did a lot of nice changes but also contains two small hunks that seem to have slipped in accidentally and have no apparent connection to the intent of the patch. This reverts the two extraneous changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Peter Senna Tschudin <peter.senna@gmail.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Sasha Levin <sasha.levin@oracle.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/smpboot.c2
-rw-r--r--net/9p/trans_virtio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 25d3d8b6e4e..8eaed9aa9cf 100644
--- a/kernel/smpboot.c
+++ b/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/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 74dea377fe5..de2e950a0a7 100644
--- a/net/9p/trans_virtio.c
+++ b/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