1 files changed, 3 insertions, 7 deletions

diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c
index 1d95c204186b..47080c49cc7e 100644
--- a/arch/arm64/kernel/kaslr.c
+++ b/arch/arm64/kernel/kaslr.c
@@ -131,8 +131,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
         /*
          * The kernel Image should not extend across a 1GB/32MB/512MB alignment
          * boundary (for 4KB/16KB/64KB granule kernels, respectively). If this
-         * happens, increase the KASLR offset by the size of the kernel image
-         * rounded up by SWAPPER_BLOCK_SIZE.
+         * happens, round down the KASLR offset by (1 << SWAPPER_TABLE_SHIFT).
          *
          * NOTE: The references to _text and _end below will already take the
          *       modulo offset (the physical displacement modulo 2 MB) into
@@ -141,11 +140,8 @@ u64 __init kaslr_early_init(u64 dt_phys)
          *       mapping we choose.
          */
         if ((((u64)_text + offset) >> SWAPPER_TABLE_SHIFT) !=
-            (((u64)_end + offset) >> SWAPPER_TABLE_SHIFT)) {
-                u64 kimg_sz = _end - _text;
-                offset = (offset + round_up(kimg_sz, SWAPPER_BLOCK_SIZE))
-                                & mask;
-        }
+            (((u64)_end + offset) >> SWAPPER_TABLE_SHIFT))
+                offset = round_down(offset, 1 << SWAPPER_TABLE_SHIFT);
 
         if (IS_ENABLED(CONFIG_KASAN))
                 /*