Skip to contentSkip to conversation

Patch "cpsw/netcp: cpts depends on posix_timers" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 28, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

cpsw/netcp: cpts depends on posix_timers

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
cpsw-netcp-cpts-depends-on-posix_timers.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 07fef3623407444e51c12ea57cd91df38c1069e0 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Mon, 20 Mar 2017 09:58:33 +0100
Subject: cpsw/netcp: cpts depends on posix_timers

From: Arnd Bergmann <[email protected]>

commit 07fef3623407444e51c12ea57cd91df38c1069e0 upstream.

With posix timers having become optional, we get a build error with the cpts time sync option of the CPSW driver:

drivers/net/ethernet/ti/cpts.c: In function 'cpts_find_ts':
drivers/net/ethernet/ti/cpts.c:291:23: error: implicit declaration of function 'ptp_classify_raw';did you mean 'ptp_classifier_init'? [-Werror=implicit-function-declaration]

This adds a hard dependency on PTP_CLOCK to avoid the problem, as building it without PTP support makes no sense anyway.

Fixes baa73d9e478f ("posix-timers: Make them configurable")
Cc Nicolas Pitre <[email protected]>
---
 drivers/net/ethernet/ti/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/Kconfig +1 -1
@@ -76,7 +76,7 @@ config TI_CPSW
 config TI_CPTS
 	tristate "TI Common Platform Time Sync (CPTS) Support"
 	depends on TI_CPSW || TI_KEYSTONE_NETCP
-	imply PTP_1588_CLOCK
+	depends on PTP_1588_CLOCK
 	---help---
 	  This driver supports the Common Platform Time Sync unit of
 	  the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/cpsw-netcp-cpts-depends-on-posix_timers.patch