Revert "kernel: printk: specify alignment for struct printk_log"
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 25 Apr 2018 09:53:45 +0000 (11:53 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 25 Apr 2018 09:53:45 +0000 (11:53 +0200)
This reverts commit afd9366a637e65dfeff3d0ce1b20d85d1acca680.

kernel/printk/printk.c

index 77ef5e0dcf58d465afc27d8fc4e4b0d38fdf8fcb..fe70b2879b59252ed8e22e83f06bdf3311faee71 100644 (file)
@@ -224,11 +224,7 @@ struct printk_log {
        u8 facility;            /* syslog facility */
        u8 flags:5;             /* internal record flags */
        u8 level:3;             /* syslog level */
-}
-#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
-__packed __aligned(4)
-#endif
-;
+};
 
 struct log_buffer {
 #ifdef CONFIG_PRINTK
@@ -275,7 +271,11 @@ static u32 clear_idx;
 #define LOG_LINE_MAX           (1024 - PREFIX_MAX)
 
 /* record buffer */
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
+#define LOG_ALIGN 4
+#else
 #define LOG_ALIGN __alignof__(struct printk_log)
+#endif
 #define __LOG_BUF_K_LEN (1 << CONFIG_LOG_BUF_SHIFT)
 static char __log_buf_k[__LOG_BUF_K_LEN] __aligned(LOG_ALIGN);