projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
block
/
blktrace.c
diff --git
a/block/blktrace.c
b/block/blktrace.c
index 7cf9d1ff45a015e0d8fe7be2546c6fb7f95f590e..028120a0965aa9a723196d1f245012151459ae3a 100644
(file)
--- a/
block/blktrace.c
+++ b/
block/blktrace.c
@@
-363,7
+363,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;