From d1b179c58f75453ae49675b445f51a8430754e9c Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Wed, 9 Sep 2015 05:36:32 -0400 Subject: [PATCH] dtrace: ensure dt_perf does not clash with dt_test The dt_perf provider module (only used for internal testing) mistakenly registered its device file with the same minor number as dt_test. This made it impossible for both to be loaded at the same time. Orabug: 21814949 Signed-off-by: Kris Van Hees Acked-by: Nick Alcock --- dtrace/dt_perf_dev.c | 2 +- dtrace/dtrace_dev.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dtrace/dt_perf_dev.c b/dtrace/dt_perf_dev.c index 47f2dba6a48a..9abd15625847 100644 --- a/dtrace/dt_perf_dev.c +++ b/dtrace/dt_perf_dev.c @@ -126,7 +126,7 @@ static const struct file_operations dt_perf_fops = { }; static struct miscdevice dt_perf_dev = { - .minor = DT_DEV_DT_TEST_MINOR, + .minor = DT_DEV_DT_PERF_MINOR, .name = "dt_perf", .nodename = "dtrace/provider/dt_perf", .fops = &dt_perf_fops, diff --git a/dtrace/dtrace_dev.h b/dtrace/dtrace_dev.h index 4e614f3123eb..670c77169ee1 100644 --- a/dtrace/dtrace_dev.h +++ b/dtrace/dtrace_dev.h @@ -10,6 +10,7 @@ #define DT_DEV_FASTTRAP_MINOR (DT_DEV_SDT_MINOR + 1) #define DT_DEV_LOCKSTAT_MINOR (DT_DEV_FASTTRAP_MINOR + 1) #define DT_DEV_DT_TEST_MINOR (DT_DEV_LOCKSTAT_MINOR + 1) +#define DT_DEV_DT_PERF_MINOR (DT_DEV_DT_TEST_MINOR + 1) extern int dtrace_dev_init(void); extern void dtrace_dev_exit(void); -- 2.50.1