diff options
author | Seema Khowala <seemaj@nvidia.com> | 2014-03-17 16:22:16 -0700 |
---|---|---|
committer | Alexander Van Brunt <avanbrunt@nvidia.com> | 2014-03-18 07:48:38 -0700 |
commit | 510a5520115d982ad5cb5bb400ac30f3182e308c (patch) | |
tree | f81a372130cfc8550a6af8910f8164db15a4ecc1 | |
parent | 7e79ded583aadc80d4256aeca789be3c1867c617 (diff) |
Revert "Revert parts of "hlist: drop the node parameter from iterators""
This reverts commit dc893e19b5800d7743fb58235877bfa9091805ff.
Bug 1481993
Change-Id: I147913ac71e89cba13a5a99a751e142c1d3a61da
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/382701
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
-rw-r--r-- | kernel/smpboot.c | 2 | ||||
-rw-r--r-- | net/9p/trans_virtio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/smpboot.c b/kernel/smpboot.c index 02fc5c933673..8039ad9e7ca0 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 c76a4388a5d7..b007ac1e4f2d 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -693,7 +693,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 |