diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /block/blktrace.c | |
parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'block/blktrace.c')
-rw-r--r-- | block/blktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index 7cf9d1ff45a..028120a0965 100644 --- 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; |