diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-26 12:40:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-26 12:40:21 +0300 |
| commit | 4d8773b68e83558025303f266070b31bc4101e73 (patch) | |
| tree | 151cafa469fbc6a411d36b58ab802f67869cc0bb /arch/powerpc/include/asm/book3s/64/mmu-hash.h | |
| parent | 3333e50b64fe30b7e53cf02456a2f567f689ae4f (diff) | |
| parent | 2821e26f3a0a3872184581caac8115bb02641941 (diff) | |
| download | linux-4d8773b68e83558025303f266070b31bc4101e73.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in mlx5 because changes happened to code that has
moved meanwhile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/include/asm/book3s/64/mmu-hash.h')
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/mmu-hash.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index 15b75005bc34..3fa1b962dc27 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -600,8 +600,11 @@ extern void slb_set_size(u16 size); * */ #define MAX_USER_CONTEXT ((ASM_CONST(1) << CONTEXT_BITS) - 2) + +// The + 2 accounts for INVALID_REGION and 1 more to avoid overlap with kernel #define MIN_USER_CONTEXT (MAX_KERNEL_CTX_CNT + MAX_VMALLOC_CTX_CNT + \ - MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT) + MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT + 2) + /* * For platforms that support on 65bit VA we limit the context bits */ |