TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UBUNTU: backports: respect already existing redefinitions in the flo tree

Browse Source 
As the flo tree isn't a clean 3.4 one without further modifications and backported things
from upstream we need to respect already present symbols from newer upstream kernel
versions and drop them from our compatiblity layer.

BugLink: http://bugs.launchpad.net/bugs/1489327

Signed-off-by: Simon Fels <simon.fels@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
This commit is contained in:
Simon Fels
2014-11-13 10:17:04 +01:00
committed by Tim Gardner
parent 62e84e1cd2
commit 0b6d2e6540
3 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backports/backport-include/asm/dma-mapping.h
View File

@@ -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); void *cpu_addr, dma_addr_t dma_addr, size_t size);
#endif /* defined(CONFIG_BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS) */ #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 */ #endif /* __BACKPORT_ASM_DMA_MAPPING_H */

41
backports/compat/backport-3.10.c
View File

@@ -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); 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 #ifdef CONFIG_TTY
/** /**
* tty_port_tty_wakeup - helper to wake up a 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)); VM_BUG_ON(atomic_read(&page->_count));
set_page_count(page, 1); set_page_count(page, 1);
} }
/*
* split_page takes a non-compound higher-order page, and splits it into
* n (1<<order) sub-pages: page[0..n]
* Each sub-page must be freed individually.
*
* Note: this is probably too low level an operation for use in drivers.
* Please consult with lkml before using this in your driver.
*/
void split_page(struct page *page, unsigned int order)
{
int i;
VM_BUG_ON(PageCompound(page));
VM_BUG_ON(!page_count(page));
#ifdef CONFIG_KMEMCHECK
/*
* Split shadow pages too, because free(page[0]) would
* otherwise free the whole shadow.
*/
if (kmemcheck_page_is_tracked(page))
split_page(virt_to_page(page[0].shadow), order);
#endif
for (i = 1; i < (1 << order); i++)
set_page_refcounted(page + i);
}
EXPORT_SYMBOL_GPL(split_page);

14
backports/compat/compat-3.6.c
View File

@@ -147,17 +147,3 @@ int sg_alloc_table_from_pages(struct sg_table *sgt,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages); EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages);
/* whoopsie ! */
#ifndef CONFIG_COMMON_CLK
int clk_enable(struct clk *clk)
{
return 0;
}
EXPORT_SYMBOL_GPL(clk_enable);
void clk_disable(struct clk *clk)
{
}
EXPORT_SYMBOL_GPL(clk_disable);
#endif