Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular

In commit 941943cf519f7cacbbcecee5c4ef4b77b466bd5c ("drivers/hwtracing:
make coresight-* explicitly non-modular") we removed all uses of
modular functions/macros in favour of their built-in equivlents in
this subsystem.

However that commit and commit 0bcbf2e30ff2271b54f54c8697a185f7d86ec6e4
("coresight: etm-perf: new PMU driver for ETM tracers") were in flight
at the same time, and hence one new non-modular user of module_init
crept back in. Fix it up like we did all the others.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Paul Gortmaker and committed by
Greg Kroah-Hartman
ca48fa22 ecb63a1b

+2 -2
+2 -2
drivers/hwtracing/coresight/coresight-etm-perf.c
··· 21 21 #include <linux/device.h> 22 22 #include <linux/list.h> 23 23 #include <linux/mm.h> 24 - #include <linux/module.h> 24 + #include <linux/init.h> 25 25 #include <linux/perf_event.h> 26 26 #include <linux/slab.h> 27 27 #include <linux/types.h> ··· 390 390 391 391 return ret; 392 392 } 393 - module_init(etm_perf_init); 393 + device_initcall(etm_perf_init);