projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
include
/
trace
/
events
/
mmflags.h
diff --git
a/include/trace/events/mmflags.h
b/include/trace/events/mmflags.h
index
f160484
..
116ed4d
100644
(file)
--- a/
include/trace/events/mmflags.h
+++ b/
include/trace/events/mmflags.h
@@
-75,7
+75,7
@@
#define IF_HAVE_PG_HWPOISON(flag,string)
#endif
#define IF_HAVE_PG_HWPOISON(flag,string)
#endif
-#if defined(CONFIG_
IDLE_PAGE_TRACKIN
G) && defined(CONFIG_64BIT)
+#if defined(CONFIG_
PAGE_IDLE_FLA
G) && defined(CONFIG_64BIT)
#define IF_HAVE_PG_IDLE(flag,string) ,{1UL << flag, string}
#else
#define IF_HAVE_PG_IDLE(flag,string)
#define IF_HAVE_PG_IDLE(flag,string) ,{1UL << flag, string}
#else
#define IF_HAVE_PG_IDLE(flag,string)
@@
-165,7
+165,6
@@
IF_HAVE_PG_SKIP_KASAN_POISON(PG_skip_kasan_poison, "skip_kasan_poison")
{VM_UFFD_MISSING, "uffd_missing" }, \
IF_HAVE_UFFD_MINOR(VM_UFFD_MINOR, "uffd_minor" ) \
{VM_PFNMAP, "pfnmap" }, \
{VM_UFFD_MISSING, "uffd_missing" }, \
IF_HAVE_UFFD_MINOR(VM_UFFD_MINOR, "uffd_minor" ) \
{VM_PFNMAP, "pfnmap" }, \
- {VM_DENYWRITE, "denywrite" }, \
{VM_UFFD_WP, "uffd_wp" }, \
{VM_LOCKED, "locked" }, \
{VM_IO, "io" }, \
{VM_UFFD_WP, "uffd_wp" }, \
{VM_LOCKED, "locked" }, \
{VM_IO, "io" }, \