From 29c8c7872fa5ec569f4784412c5924ff6d099de1 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 16 Oct 2007 23:29:34 -0700 Subject: [PATCH] --- yaml --- r: 70662 b: refs/heads/master c: d5aa0daf6d9f327a9c13bc3a203bfac2b8707e2f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/init.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a5d02378927..d9d000ae6434 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 004429956b4875e6bc2a31833f75363ce48cbea9 +refs/heads/master: d5aa0daf6d9f327a9c13bc3a203bfac2b8707e2f diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h index 9b7a2ba8237e..5141381a7527 100644 --- a/trunk/include/linux/init.h +++ b/trunk/include/linux/init.h @@ -161,7 +161,7 @@ struct obs_kernel_param { * obs_kernel_param "array" too far apart in .init.setup. */ #define __setup_param(str, unique_id, fn, early) \ - static char __setup_str_##unique_id[] __initdata = str; \ + static char __setup_str_##unique_id[] __initdata __aligned(1) = str; \ static struct obs_kernel_param __setup_##unique_id \ __attribute_used__ \ __attribute__((__section__(".init.setup"))) \