1 files changed, 4 insertions, 13 deletions

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 05b0b3139ebc..66358d66c933 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -128,16 +128,7 @@ int ring_buffer_print_entry_header(struct trace_seq *s)
 #define RB_ALIGNMENT            4U
 #define RB_MAX_SMALL_DATA       (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX)
 #define RB_EVNT_MIN_SIZE        8U      /* two 32bit words */
-
-#ifndef CONFIG_HAVE_64BIT_ALIGNED_ACCESS
-# define RB_FORCE_8BYTE_ALIGNMENT       0
-# define RB_ARCH_ALIGNMENT              RB_ALIGNMENT
-#else
-# define RB_FORCE_8BYTE_ALIGNMENT       1
-# define RB_ARCH_ALIGNMENT              8U
-#endif
-
-#define RB_ALIGN_DATA           __aligned(RB_ARCH_ALIGNMENT)
+#define RB_ALIGN_DATA           __aligned(RB_ALIGNMENT)
 
 /* define RINGBUF_TYPE_DATA for 'case RINGBUF_TYPE_DATA:' */
 #define RINGBUF_TYPE_DATA 0 ... RINGBUF_TYPE_DATA_TYPE_LEN_MAX
@@ -2373,7 +2364,7 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
 
         event->time_delta = delta;
         length -= RB_EVNT_HDR_SIZE;
-        if (length > RB_MAX_SMALL_DATA || RB_FORCE_8BYTE_ALIGNMENT) {
+        if (length > RB_MAX_SMALL_DATA) {
                 event->type_len = 0;
                 event->array[0] = length;
         } else
@@ -2388,11 +2379,11 @@ static unsigned rb_calculate_event_length(unsigned length)
         if (!length)
                 length++;
 
-        if (length > RB_MAX_SMALL_DATA || RB_FORCE_8BYTE_ALIGNMENT)
+        if (length > RB_MAX_SMALL_DATA)
                 length += sizeof(event.array[0]);
 
         length += RB_EVNT_HDR_SIZE;
-        length = ALIGN(length, RB_ARCH_ALIGNMENT);
+        length = ALIGN(length, RB_ALIGNMENT);
 
         /*
          * In case the time delta is larger than the 27 bits for it