diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 13:58:38 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 13:58:38 -0700 |
| commit | 561bed688bffedd6bbdfa70af7a4f64f0a3e2140 (patch) | |
| tree | 19256b7a70dcdb9a95c4a7494a0b8bb9db10ef30 /include/linux/vmalloc.h | |
| parent | 4b5a3ab17c6c942bd428984b6b37fe3c07f18ab3 (diff) | |
| parent | fc0c0548c1a2e676d3a928aaed70f2d4d254e395 (diff) | |
| download | cachepc-linux-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.tar.gz cachepc-linux-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts!
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 2644425b6dce..671d402c3778 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -225,9 +225,6 @@ static inline bool is_vm_area_hugepages(const void *addr) } #ifdef CONFIG_MMU -int vmap_range(unsigned long addr, unsigned long end, - phys_addr_t phys_addr, pgprot_t prot, - unsigned int max_page_shift); void vunmap_range(unsigned long addr, unsigned long end); static inline void set_vm_flush_reset_perms(void *addr) { |