Skip to content

Commit

Permalink
Revert parts of "hlist: drop the node parameter from iterators"
Browse files Browse the repository at this point in the history
Commit b67bfe0 ("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>
  • Loading branch information
Arnd Bergmann authored and Linus Torvalds committed Mar 8, 2013
1 parent 2e1c9b2 commit dc893e1
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kernel/smpboot.c
Original file line number Diff line number Diff line change
@@ -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) {
2 changes: 1 addition & 1 deletion net/9p/trans_virtio.c
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit dc893e1

Please sign in to comment.