2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index a3f4d72bedc9..1899ab251393 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -625,9 +625,8 @@ acpi_ex_do_logical_op(u16 opcode,
 
                 /* Lexicographic compare: compare the data bytes */
 
-                compare = ACPI_MEMCMP((const char *)operand0->buffer.pointer,
-                                      (const char *)local_operand1->buffer.
-                                      pointer,
+                compare = ACPI_MEMCMP(operand0->buffer.pointer,
+                                      local_operand1->buffer.pointer,
                                       (length0 > length1) ? length1 : length0);
 
                 switch (opcode) {
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 9a2f5bea3afe..1897379b5f90 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -77,7 +77,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         struct acpi_mem_space_context *mem_info = region_context;
         u32 length;
         acpi_size window_size;
-#ifndef ACPI_MISALIGNED_TRANSFERS
+#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED
         u32 remainder;
 #endif
 
@@ -109,7 +109,7 @@ acpi_ex_system_memory_space_handler(u32 function,
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
-#ifndef ACPI_MISALIGNED_TRANSFERS
+#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED
         /*
          * Hardware does not support non-aligned data transfers, we must verify
          * the request.