Commit dc893e19 authored Mar 08, 2013 by Arnd Bergmann Committed by Linus Torvalds Mar 08, 2013

Revert parts of "hlist: drop the node parameter from iterators"



Commit b67bfe0d ("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>

parent 2e1c9b28

kernel/smpboot.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

net/9p/trans_virtio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message