Messages in this thread Patch in this message | | | From | Sasha Levin <> | Subject | [PATCH] hlist: fix up unintentional hunks | Date | Mon, 4 Mar 2013 12:07:11 -0500 |
| |
I've probably fucked up when I created the big patch out of all the small chunks and pulled two hunks that I shouldn't have.
Reported-by: Paul Bolle <pebolle@tiscali.nl> Reported-by: Thomas Schlichter <thomas.schlichter@web.de> Signed-off-by: Sasha Levin <sasha.levin@oracle.com> --- kernel/smpboot.c | 2 +- net/9p/trans_virtio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/smpboot.c b/kernel/smpboot.c index b9bde57..d4abac2 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 74dea37..de2e950 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 -- 1.8.1.4
| |