| commit | 0f672f6c0b52b7b0700b0915c72b540721af4465 | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Tue Dec 10 10:32:29 2019 +0000 |
| committer | David Brazdil <dbrazdil@google.com> | Tue Dec 10 19:03:18 2019 +0000 |
| tree | 85c8cba019caa205e4f8920d72d93f6d6deaf29c | |
| parent | 3a0ad55d848b50499b68d7141d4eca997fce28ef [diff] [blame] |
Update Linux to v5.4.2 Change-Id: Idf6911045d9d382da2cfe01b1edff026404ac8fd
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 0bef238..6176b9a 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c
@@ -26,7 +26,7 @@ #include <linux/moduleloader.h> #include <linux/interrupt.h> #include <linux/poll.h> -#include <linux/bootmem.h> +#include <linux/memblock.h> #include <asm/mipsregs.h> #include <asm/mipsmtregs.h> #include <asm/cacheflush.h>