diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-26 09:27:59 +1000 |
| commit | 35482f9dc56b9bd0f179106da7e461f6c2a2d891 (patch) | |
| tree | b04c95e464c3724b5b5b0ba50ad4a26886b2497a /arch/riscv/include | |
| parent | 8da49a33dda7294c1af508f8aa81cd638d0afd62 (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
Backmerge tag 'v5.14-rc3' into drm-next
Linux 5.14-rc3
Daniel said we should pull the nouveau fix from fixes in here, probably
a good plan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/riscv/include')
| -rw-r--r-- | arch/riscv/include/asm/efi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/include/asm/efi.h b/arch/riscv/include/asm/efi.h index 7a8f0d45b13a..49b398fe99f1 100644 --- a/arch/riscv/include/asm/efi.h +++ b/arch/riscv/include/asm/efi.h @@ -28,10 +28,10 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE) -/* Load initrd at enough distance from DRAM start */ +/* Load initrd anywhere in system RAM */ static inline unsigned long efi_get_max_initrd_addr(unsigned long image_addr) { - return image_addr + SZ_256M; + return ULONG_MAX; } #define alloc_screen_info(x...) (&screen_info) |