diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-03 01:49:55 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-03 01:49:55 +0300 |
| commit | 82b4a9412b4de2f68679f1403f1d229390ace27e (patch) | |
| tree | 920454da3f6d509be95ae3c5c72921bfddc39c20 /arch/arm/mm/nommu.c | |
| parent | b18ea3d9d214dfb23b0b6bd2acc121cb0d0fa2c5 (diff) | |
| parent | edb9b8f380c3413bf783475279b1a941c7e5cec1 (diff) | |
| download | linux-82b4a9412b4de2f68679f1403f1d229390ace27e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/core/gro.c
7d2c89b32587 ("skb: Do mix page pool and page referenced frags in GRO")
b1a78b9b9886 ("net: add support for ipv4 big tcp")
https://lore.kernel.org/all/20230203094454.5766f160@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/arm/mm/nommu.c')
| -rw-r--r-- | arch/arm/mm/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index c1494a4dee25..53f2d8774fdb 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -161,7 +161,7 @@ void __init paging_init(const struct machine_desc *mdesc) mpu_setup(); /* allocate the zero page. */ - zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE); + zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE); if (!zero_page) panic("%s: Failed to allocate %lu bytes align=0x%lx\n", __func__, PAGE_SIZE, PAGE_SIZE); |