* Arnd Bergmann <arnd@xxxxxxxx> [170428 08:06]: > Tony Lindgren reports a kernel oops that resulted from my compile-time > fix on the default config. This shows two problems: > > a) configurations that did not already enable PTP_1588_CLOCK will > now miss the cpts driver > > b) when cpts support is disabled, the driver crashes. This is a > preexisting problem that we did not notice before my patch. > > While the second problem is still being investigated, this modifies > the dependencies again, getting us back to the original state, with > another 'select NET_PTP_CLASSIFY' added in to avoid the original > link error we got, and the 'depends on POSIX_TIMERS' to hide > the CPTS support when turning it on would be useless. > > Cc: stable@xxxxxxxxxxxxxxx # 4.11 needs this > Fixes: 07fef3623407 ("cpsw/netcp: cpts depends on posix_timers") > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > --- > Adding the Cc: stable in case this doesn't make it into 4.11 > any more. Thanks this fixes the oops I'm seeing: Tested-by: Tony Lindgren <tony@xxxxxxxxxxx> > drivers/net/ethernet/ti/Kconfig | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig > index 9e631952b86f..48a541eb0af2 100644 > --- a/drivers/net/ethernet/ti/Kconfig > +++ b/drivers/net/ethernet/ti/Kconfig > @@ -76,7 +76,7 @@ config TI_CPSW > config TI_CPTS > bool "TI Common Platform Time Sync (CPTS) Support" > depends on TI_CPSW || TI_KEYSTONE_NETCP > - depends on PTP_1588_CLOCK > + depends on POSIX_TIMERS > ---help--- > This driver supports the Common Platform Time Sync unit of > the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem. > @@ -87,6 +87,8 @@ config TI_CPTS_MOD > tristate > depends on TI_CPTS > default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y > + select NET_PTP_CLASSIFY > + imply PTP_1588_CLOCK > default m > > config TI_KEYSTONE_NETCP > -- > 2.9.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html