diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
| commit | 5710faba8a2a15349c9001bd4b2cd958e56c90fa (patch) | |
| tree | 80694ac211cac1b2347c3c905b38d86139dc51c1 /arch/riscv/include/asm/page.h | |
| parent | 5600f6986628dde8881734090588474f54a540a8 (diff) | |
| parent | a949087c2285c8de4f0f204cab2d4eece9d929a2 (diff) | |
| download | linux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.tar.gz linux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.tar.bz2 linux-5710faba8a2a15349c9001bd4b2cd958e56c90fa.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.18 merge window.
Diffstat (limited to 'arch/riscv/include/asm/page.h')
| -rw-r--r-- | arch/riscv/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h index 160e3a1e8f8b..004372f8da54 100644 --- a/arch/riscv/include/asm/page.h +++ b/arch/riscv/include/asm/page.h @@ -119,7 +119,7 @@ extern phys_addr_t phys_ram_base; ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size)) #define is_linear_mapping(x) \ - ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < kernel_map.virt_addr)) + ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE)) #define linear_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset)) #define kernel_mapping_pa_to_va(y) ({ \ |