---

yaml --- r: 70662 b: refs/heads/master c: d5aa0da h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 29c8c78 · 29c8c78
1 parent b526226
commit 29c8c78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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")))	\