Hi all,
Today's linux-next merge of the tracing tree got a conflict in
block/blktrace.c between commit 313e458f81ec3852106c5a83830fe0d4f405a71a
("alloc_percpu: add align argument to __alloc_percpu") from the tip-core
tree and commit 2db270a80b8f2238e536876cfb3987af02684df8
("tracing/blktrace: move the tracing file to kernel/trace") from the
tracing tree.
I applied the block/blktrace.c part of the former commit to
kernel/trace/blktrace.c (see below) and can carry this fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index e39679a..d24a10b 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -423,7 +423,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
if (!bt->sequence)
goto err;
- bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG);
+ bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG, __alignof__(char));
if (!bt->msg_data)
goto err;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
