From bd578d0e46a78e890be82c9a25d28466f395eacb Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Tue, 5 Jun 2012 08:52:34 +0200
Subject: [PATCH] --- yaml --- r: 311138 b: refs/heads/master c:
 6ebb017de9d59a18c3ff9648270e8f6abaa93438 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1714f5ef5c4c..d03b562e4a91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc2c9c3fff859e0eb019fe6fec26f9b8eba795c
+refs/heads/master: 6ebb017de9d59a18c3ff9648270e8f6abaa93438
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 32462d2b364a..f205c25c37e2 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -227,10 +227,10 @@ static u32 clear_idx;
 #define LOG_LINE_MAX 1024
 
 /* record buffer */
-#if !defined(CONFIG_64BIT) || defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
 #define LOG_ALIGN 4
 #else
-#define LOG_ALIGN 8
+#define LOG_ALIGN __alignof__(struct log)
 #endif
 #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
 static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN);