* [PATCH 0/3] backports: fixes for RHEL7.0
@ 2014-04-25 7:14 Stefan Assmann
2014-04-25 7:14 ` [PATCH 1/3] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() Stefan Assmann
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Stefan Assmann @ 2014-04-25 7:14 UTC (permalink / raw)
To: mcgrof; +Cc: backports, sassmann
Get backports ready for RHEL7.0.
Stefan Assmann (3):
backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT()
backports: add linux/of_graph.h to copy-list
backports: ifdef code already present in RHEL7.0
backport/backport-include/linux/device.h | 2 +-
backport/backport-include/linux/dma-mapping.h | 1 +
backport/backport-include/linux/skbuff.h | 2 +-
backport/compat/dma-shared-helpers.c | 2 ++
copy-list | 1 +
5 files changed, 6 insertions(+), 2 deletions(-)
--
1.9.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT()
2014-04-25 7:14 [PATCH 0/3] backports: fixes for RHEL7.0 Stefan Assmann
@ 2014-04-25 7:14 ` Stefan Assmann
2014-04-25 7:14 ` [PATCH 2/3] backports: add linux/of_graph.h to copy-list Stefan Assmann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Assmann @ 2014-04-25 7:14 UTC (permalink / raw)
To: mcgrof; +Cc: backports, sassmann
To avoid conflicts with any distribution kernel wrap
dma_set_mask_and_coherent with LINUX_BACKPORT().
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
---
backport/backport-include/linux/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/backport/backport-include/linux/dma-mapping.h b/backport/backport-include/linux/dma-mapping.h
index 9b2bc90..fdc3331 100644
--- a/backport/backport-include/linux/dma-mapping.h
+++ b/backport/backport-include/linux/dma-mapping.h
@@ -22,6 +22,7 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size,
* as the DMA API guarantees that the coherent DMA mask can be set to
* the same or smaller than the streaming DMA mask.
*/
+#define dma_set_mask_and_coherent LINUX_BACKPORT(dma_set_mask_and_coherent)
static inline int dma_set_mask_and_coherent(struct device *dev, u64 mask)
{
int rc = dma_set_mask(dev, mask);
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] backports: add linux/of_graph.h to copy-list
2014-04-25 7:14 [PATCH 0/3] backports: fixes for RHEL7.0 Stefan Assmann
2014-04-25 7:14 ` [PATCH 1/3] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() Stefan Assmann
@ 2014-04-25 7:14 ` Stefan Assmann
2014-04-25 7:14 ` [PATCH 3/3] backports: ifdef code already present in RHEL7.0 Stefan Assmann
2014-05-02 0:59 ` [PATCH 0/3] backports: fixes for RHEL7.0 Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Assmann @ 2014-04-25 7:14 UTC (permalink / raw)
To: mcgrof; +Cc: backports, sassmann
Required by CONFIG_VIDEO_ADV7343 and others.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
---
copy-list | 1 +
1 file changed, 1 insertion(+)
diff --git a/copy-list b/copy-list
index 2794c0c..76c07cb 100644
--- a/copy-list
+++ b/copy-list
@@ -178,6 +178,7 @@ include/trace/events/v4l2.h
drivers/media/
include/linux/platform_data/vsp1.h
include/linux/platform_data/camera-rcar.h
+include/linux/of_graph.h
include/net/6lowpan.h
include/net/netns/ieee802154_6lowpan.h
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] backports: ifdef code already present in RHEL7.0
2014-04-25 7:14 [PATCH 0/3] backports: fixes for RHEL7.0 Stefan Assmann
2014-04-25 7:14 ` [PATCH 1/3] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() Stefan Assmann
2014-04-25 7:14 ` [PATCH 2/3] backports: add linux/of_graph.h to copy-list Stefan Assmann
@ 2014-04-25 7:14 ` Stefan Assmann
2014-05-02 0:59 ` [PATCH 0/3] backports: fixes for RHEL7.0 Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Assmann @ 2014-04-25 7:14 UTC (permalink / raw)
To: mcgrof; +Cc: backports, sassmann
Avoid conflicts with RHEL7.0 as DEVICE_ATTR_* defines,
enum pkt_hash_types, skb_set_hash(), dma_common_get_sgtable()
are already present.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
---
backport/backport-include/linux/device.h | 2 +-
backport/backport-include/linux/skbuff.h | 2 +-
backport/compat/dma-shared-helpers.c | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h
index 3f57bd9..d6226ab 100644
--- a/backport/backport-include/linux/device.h
+++ b/backport/backport-include/linux/device.h
@@ -102,7 +102,7 @@ backport_device_release_driver(struct device *dev)
#define device_release_driver LINUX_BACKPORT(device_release_driver)
#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3,6,0) */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0)
#ifndef DEVICE_ATTR_RO
#define DEVICE_ATTR_RO(_name) \
struct device_attribute dev_attr_ ## _name = __ATTR_RO(_name);
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index fae13b7..2576faf 100644
--- a/backport/backport-include/linux/skbuff.h
+++ b/backport/backport-include/linux/skbuff.h
@@ -327,7 +327,7 @@ static inline void skb_frag_set_page(struct sk_buff *skb, int f,
}
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0)
/*
* Packet hash types specify the type of hash in skb_set_hash.
*
diff --git a/backport/compat/dma-shared-helpers.c b/backport/compat/dma-shared-helpers.c
index f76cf06..2ada681 100644
--- a/backport/compat/dma-shared-helpers.c
+++ b/backport/compat/dma-shared-helpers.c
@@ -20,6 +20,7 @@
#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3,6,0) */
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
+#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0)
/*
* Create scatter-list for the already allocated DMA buffer.
*/
@@ -37,3 +38,4 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
return 0;
}
EXPORT_SYMBOL_GPL(dma_common_get_sgtable);
+#endif /* RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) */
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] backports: fixes for RHEL7.0
2014-04-25 7:14 [PATCH 0/3] backports: fixes for RHEL7.0 Stefan Assmann
` (2 preceding siblings ...)
2014-04-25 7:14 ` [PATCH 3/3] backports: ifdef code already present in RHEL7.0 Stefan Assmann
@ 2014-05-02 0:59 ` Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Luis R. Rodriguez @ 2014-05-02 0:59 UTC (permalink / raw)
To: Stefan Assmann; +Cc: backports
On Fri, Apr 25, 2014 at 09:14:27AM +0200, Stefan Assmann wrote:
> Get backports ready for RHEL7.0.
>
> Stefan Assmann (3):
> backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT()
> backports: add linux/of_graph.h to copy-list
> backports: ifdef code already present in RHEL7.0
>
> backport/backport-include/linux/device.h | 2 +-
> backport/backport-include/linux/dma-mapping.h | 1 +
> backport/backport-include/linux/skbuff.h | 2 +-
> backport/compat/dma-shared-helpers.c | 2 ++
> copy-list | 1 +
> 5 files changed, 6 insertions(+), 2 deletions(-)
Thanks, applied!
Luis
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-02 0:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-25 7:14 [PATCH 0/3] backports: fixes for RHEL7.0 Stefan Assmann
2014-04-25 7:14 ` [PATCH 1/3] backports: wrap dma_set_mask_and_coherent in LINUX_BACKPORT() Stefan Assmann
2014-04-25 7:14 ` [PATCH 2/3] backports: add linux/of_graph.h to copy-list Stefan Assmann
2014-04-25 7:14 ` [PATCH 3/3] backports: ifdef code already present in RHEL7.0 Stefan Assmann
2014-05-02 0:59 ` [PATCH 0/3] backports: fixes for RHEL7.0 Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.