Skip to contentSkip to conversation

hlist: fix up unintentional hunks

PATCH New Sasha Levin 1 participant 1 message Mar 4, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hlist: fix up unintentional hunks

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.

---
 kernel/smpboot.c      | 2 +-
 net/9p/trans_virtio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/smpboot.c +1 -1
index b9bde57..d4abac2 100644
@@ -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
index 74dea37..de2e950 100644
@@ -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
Signature · 1 line
1.8.1.4