From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: backports@vger.kernel.org
Cc: ben@decadent.org.uk, noelamac@gmail.com,
linux-kernel@vger.kernel.org, rusty@rustcorp.com.au,
andi@firstfloor.org,
"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Subject: [RFC 13/30] compat: embrace LINUX_BACKPORT() for v2.6.35
Date: Wed, 20 Mar 2013 02:22:38 -0700 [thread overview]
Message-ID: <1363771375-31715-14-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1363771375-31715-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.65 [ OK ]
18 3.1.10 [ OK ]
19 3.2.38 [ OK ]
20 3.3.8 [ OK ]
21 3.4.32 [ OK ]
22 3.5.7 [ OK ]
23 3.6.11 [ OK ]
24 3.7.9 [ OK ]
25 3.8.0 [ OK ]
26 3.9-rc1 [ OK ]
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
compat/compat-2.6.35.c | 4 ++--
include/linux/compat-2.6.35.h | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/compat/compat-2.6.35.c b/compat/compat-2.6.35.c
index 646afa2..20fee85 100644
--- a/compat/compat-2.6.35.c
+++ b/compat/compat-2.6.35.c
@@ -61,7 +61,7 @@ EXPORT_SYMBOL_GPL(netif_set_real_num_tx_queues);
* hex_to_bin() converts one hex digit to its actual value or -1 in case of bad
* input.
*/
-int compat_hex_to_bin(char ch)
+int hex_to_bin(char ch)
{
if ((ch >= '0') && (ch <= '9'))
return ch - '0';
@@ -70,7 +70,7 @@ int compat_hex_to_bin(char ch)
return ch - 'a' + 10;
return -1;
}
-EXPORT_SYMBOL_GPL(compat_hex_to_bin);
+EXPORT_SYMBOL_GPL(hex_to_bin);
/**
* noop_llseek - No Operation Performed llseek implementation
diff --git a/include/linux/compat-2.6.35.h b/include/linux/compat-2.6.35.h
index 82b4dea..99968bf 100644
--- a/include/linux/compat-2.6.35.h
+++ b/include/linux/compat-2.6.35.h
@@ -45,6 +45,7 @@ static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)
}
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) */
+#define netif_set_real_num_tx_queues LINUX_BACKPORT(netif_set_real_num_tx_queues)
extern int netif_set_real_num_tx_queues(struct net_device *dev,
unsigned int txq);
@@ -68,11 +69,10 @@ static inline wait_queue_head_t *sk_sleep(struct sock *sk)
#define sdio_writeb_readb(func, write_byte, addr, err_ret) sdio_readb(func, addr, err_ret)
-/* mask hex_to_bin as RHEL6 backports this */
-#define hex_to_bin(a) compat_hex_to_bin(a)
-
+#define hex_to_bin LINUX_BACKPORT(hex_to_bin)
int hex_to_bin(char ch);
+#define noop_llseek LINUX_BACKPORT(noop_llseek)
extern loff_t noop_llseek(struct file *file, loff_t offset, int origin);
#define pm_qos_request(_qos) pm_qos_requirement(_qos)
@@ -88,6 +88,7 @@ usb_pipe_endpoint(struct usb_device *dev, unsigned int pipe)
return eps[usb_pipeendpoint(pipe)];
}
+#define simple_write_to_buffer LINUX_BACKPORT(simple_write_to_buffer)
extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos,
const void __user *from, size_t count);
--
1.7.10.4
next prev parent reply other threads:[~2013-03-20 9:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 9:22 [RFC 00/30] compat: deal with kernel backport namespace Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 01/30] compat: add LINUX_BACKPORT() for prefixing symbols Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 02/30] compat: embrace LINUX_BACKPORT() for v2.6.23 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 03/30] compat: embrace LINUX_BACKPORT() for v2.6.24 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 04/30] compat: embrace LINUX_BACKPORT() for v2.6.25 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 05/30] compat: embrace LINUX_BACKPORT() for v2.6.26 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 06/30] compat: embrace LINUX_BACKPORT() for v2.6.27 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 07/30] compat: embrace LINUX_BACKPORT() for v2.6.28 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 08/30] compat: embrace LINUX_BACKPORT() for v2.6.29 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 09/30] compat: embrace LINUX_BACKPORT() for v2.6.31 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 10/30] compat: embrace LINUX_BACKPORT() for v2.6.32 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 11/30] compat: embrace LINUX_BACKPORT() for v2.6.33 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 12/30] compat: embrace LINUX_BACKPORT() for v2.6.34 Luis R. Rodriguez
2013-03-20 9:22 ` Luis R. Rodriguez [this message]
2013-03-20 9:22 ` [RFC 14/30] compat: embrace LINUX_BACKPORT() for v2.6.36 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 15/30] compat: embrace LINUX_BACKPORT() for v2.6.37 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 16/30] compat: embrace LINUX_BACKPORT() for v2.6.38 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 17/30] compat: embrace LINUX_BACKPORT() for v2.6.39 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 18/30] compat: embrace LINUX_BACKPORT() for v3.0 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 19/30] compat: embrace LINUX_BACKPORT() for v3.1 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 20/30] compat: embrace LINUX_BACKPORT() for v3.2 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 21/30] compat: embrace LINUX_BACKPORT() for v3.3 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 22/30] compat: embrace LINUX_BACKPORT() for v3.4 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 23/30] compat: embrace LINUX_BACKPORT() for v3.7 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 24/30] compat: embrace LINUX_BACKPORT() for v3.8 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 25/30] compat: embrace LINUX_BACKPORT() for cordic Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 26/30] compat: embrace LINUX_BACKPORT() for crc8 Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 27/30] compat: embrace LINUX_BACKPORT() for kfifo Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 28/30] compat: embrace LINUX_BACKPORT() for pm_qos_params Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 29/30] compat: embrace LINUX_BACKPORT() for uidgid Luis R. Rodriguez
2013-03-20 9:22 ` [RFC 30/30] compat: use backport_ prefix for main compat module calls Luis R. Rodriguez
2013-03-21 1:51 ` [RFC 00/30] compat: deal with kernel backport namespace Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363771375-31715-14-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=andi@firstfloor.org \
--cc=backports@vger.kernel.org \
--cc=ben@decadent.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=noelamac@gmail.com \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome