From 76d678b11f25db0f19c54a8de28bebab569fe4c2 Mon Sep 17 00:00:00 2001 From: Sugizaki Yukimasa Date: Thu, 4 Jan 2018 23:58:06 +0900 Subject: [PATCH] vcsm: Define cache operation constants in user header Without this change, users have to use raw values (1, 2, 3) to specify cache operation. Signed-off-by: Sugizaki Yukimasa (cherry picked from commit 55b31490ae9d428fb32706916ec0c135c05f6206 https://github.com/raspberrypi/linux raspi/rpi-4.15.y) Signed-off-by: Paolo Pisati Signed-off-by: Seth Forshee --- drivers/char/broadcom/vc_sm/vc_sm_knl.h | 5 ----- include/linux/broadcom/vmcs_sm_ioctl.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/char/broadcom/vc_sm/vc_sm_knl.h b/drivers/char/broadcom/vc_sm/vc_sm_knl.h index 4f120421c2d1..f7f74750d835 100644 --- a/drivers/char/broadcom/vc_sm/vc_sm_knl.h +++ b/drivers/char/broadcom/vc_sm/vc_sm_knl.h @@ -27,11 +27,6 @@ enum vc_sm_lock_cache_mode { VC_SM_LOCK_NON_CACHED, }; -/* Cache functions */ -#define VCSM_CACHE_OP_INV 0x01 -#define VCSM_CACHE_OP_CLEAN 0x02 -#define VCSM_CACHE_OP_FLUSH 0x03 - /* Allocate a shared memory handle and block. */ int vc_sm_alloc(struct vc_sm_alloc_t *alloc, int *handle); diff --git a/include/linux/broadcom/vmcs_sm_ioctl.h b/include/linux/broadcom/vmcs_sm_ioctl.h index b75729d762f2..ddbeebc71ada 100644 --- a/include/linux/broadcom/vmcs_sm_ioctl.h +++ b/include/linux/broadcom/vmcs_sm_ioctl.h @@ -79,6 +79,11 @@ enum vmcs_sm_cache_e { VMCS_SM_CACHE_BOTH, }; +/* Cache functions */ +#define VCSM_CACHE_OP_INV 0x01 +#define VCSM_CACHE_OP_CLEAN 0x02 +#define VCSM_CACHE_OP_FLUSH 0x03 + /* IOCTL Data structures */ struct vmcs_sm_ioctl_alloc { /* user -> kernel */ -- 2.39.5