diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-11-21 16:35:43 +0000 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-12-22 09:41:22 +0000 |
| commit | 84325931ccddb09f6313466fb272e8125569ae07 (patch) | |
| tree | 9ded98696fb29036983053593bb3cd644911be38 /compat | |
| parent | e34cb44ac7c08783b98a16eec70125e205e6eb12 (diff) | |
backports:Backports for tegra 3.1 kernel
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/backport-4.12.c | 2 | ||||
| -rw-r--r-- | compat/compat-3.5.c | 4 | ||||
| -rw-r--r-- | compat/compat-3.6.c | 2 | ||||
| -rw-r--r-- | compat/compat-3.8.c | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/compat/backport-4.12.c b/compat/backport-4.12.c index 4b16b16..d28edea 100644 --- a/compat/backport-4.12.c +++ b/compat/backport-4.12.c @@ -109,8 +109,10 @@ static void extack_netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, skb = nlmsg_new(payload + tlvlen, GFP_KERNEL); if (!skb) { +#if LINUX_VERSION_IS_GEQ(3,10,0) NETLINK_CB(in_skb).sk->sk_err = ENOBUFS; NETLINK_CB(in_skb).sk->sk_error_report(NETLINK_CB(in_skb).sk); +#endif return; } diff --git a/compat/compat-3.5.c b/compat/compat-3.5.c index de31228..721ec0e 100644 --- a/compat/compat-3.5.c +++ b/compat/compat-3.5.c @@ -67,7 +67,9 @@ EXPORT_SYMBOL_GPL(overflowuid); EXPORT_SYMBOL_GPL(overflowgid); #endif -#if IS_ENABLED(CONFIG_PTP_1588_CLOCK) +/* #if IS_ENABLED(CONFIG_PTP_1588_CLOCK) */ +/* backported to all of our kernels */ +#if 0 int ptp_clock_index(struct ptp_clock *ptp) { return ptp->index; diff --git a/compat/compat-3.6.c b/compat/compat-3.6.c index ef36485..9e593f5 100644 --- a/compat/compat-3.6.c +++ b/compat/compat-3.6.c @@ -14,6 +14,7 @@ /* whoopsie ! */ #ifndef CONFIG_COMMON_CLK +#ifndef CONFIG_ARCH_TEGRA int clk_enable(struct clk *clk) { return 0; @@ -25,3 +26,4 @@ void clk_disable(struct clk *clk) } EXPORT_SYMBOL_GPL(clk_disable); #endif +#endif diff --git a/compat/compat-3.8.c b/compat/compat-3.8.c index ff9cd49..21686cc 100644 --- a/compat/compat-3.8.c +++ b/compat/compat-3.8.c @@ -356,6 +356,8 @@ bool hid_ignore(struct hid_device *hdev) } EXPORT_SYMBOL_GPL(hid_ignore); +/* backported to our kernel */ +#if 0 /** * prandom_bytes - get the requested number of pseudo-random bytes * @buf: where to copy the pseudo-random bytes to @@ -386,6 +388,7 @@ void prandom_bytes(void *buf, int bytes) } } EXPORT_SYMBOL_GPL(prandom_bytes); +#endif #ifdef CONFIG_OF /** |