summaryrefslogtreecommitdiffstats
path: root/drivers/misc/lkdtm/lkdtm.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2019-02-20 20:51:33 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2019-02-20 20:51:33 +0100
commit4509209f8bfe158403a29d713bd3b2cb8fc2b534 (patch)
tree952962ad15753569bce64df01410217f900e06aa /drivers/misc/lkdtm/lkdtm.h
parent35c0272502cca0a1b461d310c23aac94a503983d (diff)
parent32ea33a044842ae6c5fc7e33426e0a7bd50f8801 (diff)
downloadlinux-4509209f8bfe158403a29d713bd3b2cb8fc2b534.tar.bz2
Pull in char-misc-next from Greg
We need 32ea33a04484 ("mei: bus: export to_mei_cl_device for mei client devices drivers") for the mei-hdcp patches. References: https://lkml.org/lkml/2019/2/19/356 Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/misc/lkdtm/lkdtm.h')
-rw-r--r--drivers/misc/lkdtm/lkdtm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h
index 3c6fd327e166..b69ee004a3f7 100644
--- a/drivers/misc/lkdtm/lkdtm.h
+++ b/drivers/misc/lkdtm/lkdtm.h
@@ -45,7 +45,9 @@ void lkdtm_EXEC_KMALLOC(void);
void lkdtm_EXEC_VMALLOC(void);
void lkdtm_EXEC_RODATA(void);
void lkdtm_EXEC_USERSPACE(void);
+void lkdtm_EXEC_NULL(void);
void lkdtm_ACCESS_USERSPACE(void);
+void lkdtm_ACCESS_NULL(void);
/* lkdtm_refcount.c */
void lkdtm_REFCOUNT_INC_OVERFLOW(void);