From: Xiangyou Xie xiexiangyou@huawei.com
euleros inclusion category: feature bugzilla: 46840 CVE: NA
-------------------------------------------------
Add reserved page flags for internal extension. For the new page flags which backported from kernel upstream, place them behind the the reserved page flags.
Signed-off-by: Xiangyou Xie xiexiangyou@huawei.com Reviewed-by: Zenghui Yu yuzenghui@huawei.com Reviewed-by: Jing Xiangfeng jingxiangfeng@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- include/linux/page-flags.h | 8 ++++++++ include/trace/events/mmflags.h | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 17eeaf76259b..0d395970a988 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -103,6 +103,14 @@ enum pageflags { PG_idle, #endif PG_percpu_ref, + + /* Add reserved page flags for internal extension. For the new page + * flags which backported from kernel upstream, please place them + * behind the the reserved page flags. + */ + PG_reserve_pgflag_0, + PG_reserve_pgflag_1, + __NR_PAGEFLAGS,
/* Filesystems */ diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 894305dad41e..d8965ccb9c4b 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -106,7 +106,9 @@ IF_HAVE_PG_UNCACHED(PG_uncached, "uncached" ) \ IF_HAVE_PG_HWPOISON(PG_hwpoison, "hwpoison" ) \ IF_HAVE_PG_IDLE(PG_young, "young" ) \ IF_HAVE_PG_IDLE(PG_idle, "idle"), \ - {1UL << PG_percpu_ref, "percpu_ref" } + {1UL << PG_percpu_ref, "percpu_ref" }, \ + {1UL << PG_reserve_pgflag_0, "reserve_pgflag_0"}, \ + {1UL << PG_reserve_pgflag_1, "reserve_pgflag_1"}
#define show_page_flags(flags) \ (flags) ? __print_flags(flags, "|", \
From: qinyu qinyu16@huawei.com
euleros inclusion category: Bugfix bugzilla: 46849
--------------------------------
Enable CONFIG_VIDEO_ADV_DEBUG for V4L2 drivers debug.
Signed-off-by: qinyu qinyu16@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arm64/configs/openeuler_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 2251d4d2ffc3..f306336b7059 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -3732,7 +3732,7 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_ADV_DEBUG=y CONFIG_VIDEO_FIXED_MINOR_RANGES=y # CONFIG_V4L2_FLASH_LED_CLASS is not set