diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-02-16 11:52:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-02-16 11:52:16 -0300 |
| commit | c1bd8a2b9fbc304995fb03356f878579e50d3dd8 (patch) | |
| tree | c5599739225f20c52f56c189bed786d68de64368 /include/linux/vmalloc.h | |
| parent | a89dbc9b988f3ba8700df3c58614744de0c5043f (diff) | |
| parent | 105f75ebf9519c239c96f9b16e16520f45fea72b (diff) | |
| download | cachepc-linux-c1bd8a2b9fbc304995fb03356f878579e50d3dd8.tar.gz cachepc-linux-c1bd8a2b9fbc304995fb03356f878579e50d3dd8.zip | |
Merge branch 'perf/urgent' into perf/core
To get some fixes that didn't made into 5.11.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 80c0181c411d..cedcda6593f6 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -24,7 +24,8 @@ struct notifier_block; /* in notifier.h */ #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ #define VM_NO_GUARD 0x00000040 /* don't add guard page */ #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */ -#define VM_MAP_PUT_PAGES 0x00000100 /* put pages and free array in vfree */ +#define VM_FLUSH_RESET_PERMS 0x00000100 /* reset direct map and flush TLB on unmap, can't be freed in atomic context */ +#define VM_MAP_PUT_PAGES 0x00000200 /* put pages and free array in vfree */ /* * VM_KASAN is used slighly differently depending on CONFIG_KASAN_VMALLOC. @@ -37,12 +38,6 @@ struct notifier_block; /* in notifier.h */ * determine which allocations need the module shadow freed. */ -/* - * Memory with VM_FLUSH_RESET_PERMS cannot be freed in an interrupt or with - * vfree_atomic(). - */ -#define VM_FLUSH_RESET_PERMS 0x00000100 /* Reset direct map and flush TLB on unmap */ - /* bits [20..32] reserved for arch specific ioremap internals */ /* |