| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Tobias Regnery <tobias.regnery@gmail.com> |
| Date: Tue, 10 Apr 2018 10:38:06 +0200 |
| Subject: usb: typec: ucsi: fix tracepoint related build error |
| |
| From: Tobias Regnery <tobias.regnery@gmail.com> |
| |
| [ Upstream commit 2f860691c2d2e3af1404ffeb2d22dd5c3dbca811 ] |
| |
| There is the following build error with CONFIG_TYPEC_UCSI=m, CONFIG_FTRACE=y |
| and CONFIG_TRACING=n: |
| |
| ERROR: "__tracepoint_ucsi_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_register_port" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_notify" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_reset_ppm" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_run_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_ack" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| ERROR: "__tracepoint_ucsi_connector_change" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! |
| |
| This compination is quite hard to create because CONFIG_TRACING gets selected |
| only in rare cases without CONFIG_FTRACE. |
| |
| The build failure is caused by conditionally compiling trace.c depending on |
| the wrong option CONFIG_FTRACE. Change this to depend on CONFIG_TRACING like |
| other users of tracepoints do. |
| |
| Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface") |
| Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com> |
| Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/usb/typec/ucsi/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/usb/typec/ucsi/Makefile |
| +++ b/drivers/usb/typec/ucsi/Makefile |
| @@ -5,6 +5,6 @@ obj-$(CONFIG_TYPEC_UCSI) += typec_ucsi.o |
| |
| typec_ucsi-y := ucsi.o |
| |
| -typec_ucsi-$(CONFIG_FTRACE) += trace.o |
| +typec_ucsi-$(CONFIG_TRACING) += trace.o |
| |
| obj-$(CONFIG_UCSI_ACPI) += ucsi_acpi.o |
