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 <i.can.speak.c.and.basic@gmail.com>
(cherry picked from commit 55b31490ae9d428fb32706916ec0c135c05f6206
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/char/broadcom/vc_sm/vc_sm_knl.h b/drivers/char/broadcom/vc_sm/vc_sm_knl.h
index 4f120421c2d11f7ae46752c38b073a4dfdf712c6..f7f74750d8358779c61dfcd6fc841aa1789a2c5e 100644 (file)
--- 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 b75729d762f25aace133f7a008633b4094ae2de2..ddbeebc71ada82e88a1668fbdfd9821a39d7cd22 100644 (file)
--- 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 */