diff --git a/backports/backport-include/asm/dma-mapping.h b/backports/backport-include/asm/dma-mapping.h index 0337b057d5d..dbeb9723930 100644 --- a/backports/backport-include/asm/dma-mapping.h +++ b/backports/backport-include/asm/dma-mapping.h @@ -10,18 +10,4 @@ dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr, dma_addr_t dma_addr, size_t size); #endif /* defined(CONFIG_BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) - -#define dma_get_sgtable_attrs LINUX_BACKPORT(dma_get_sgtable_attrs) -struct dma_attrs; -static inline int -dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr, - dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs) -{ - return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size); -} - -#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL) -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */ - #endif /* __BACKPORT_ASM_DMA_MAPPING_H */ diff --git a/backports/compat/backport-3.10.c b/backports/compat/backport-3.10.c index 53123fb11e0..c1c4c9bb0cd 100644 --- a/backports/compat/backport-3.10.c +++ b/backports/compat/backport-3.10.c @@ -32,18 +32,6 @@ void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) } EXPORT_SYMBOL_GPL(proc_set_user); -/* get_random_int() was not exported for module use until 3.10-rc. - Implement it here in terms of the more expensive get_random_bytes() - */ -unsigned int get_random_int(void) -{ - unsigned int r; - get_random_bytes(&r, sizeof(r)); - - return r; -} -EXPORT_SYMBOL_GPL(get_random_int); - #ifdef CONFIG_TTY /** * tty_port_tty_wakeup - helper to wake up a tty @@ -196,32 +184,3 @@ static inline void set_page_refcounted(struct page *page) VM_BUG_ON(atomic_read(&page->_count)); set_page_count(page, 1); } - -/* - * split_page takes a non-compound higher-order page, and splits it into - * n (1<