projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parisc
/
ccio-dma.c
diff --git
a/drivers/parisc/ccio-dma.c
b/drivers/parisc/ccio-dma.c
index dcc1e9958d2f9bb0b0fd3625c43ed9eaf806bfd2..cd4dd7ed2c06b60fd471319fc6ef78fca8a91184 100644
(file)
--- a/
drivers/parisc/ccio-dma.c
+++ b/
drivers/parisc/ccio-dma.c
@@
-555,7
+555,7
@@
static u32 hint_lookup[] = {
* (Load Coherence Index) instruction. The 8 bits used for the virtual
* index are bits 12:19 of the value returned by LCI.
*/
* (Load Coherence Index) instruction. The 8 bits used for the virtual
* index are bits 12:19 of the value returned by LCI.
*/
-void CCIO_INLINE
+
static
void CCIO_INLINE
ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
unsigned long hints)
{
ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
unsigned long hints)
{
@@
-1578,8
+1578,6
@@
static int __init ccio_probe(struct parisc_device *dev)
ioc_count++;
ioc_count++;
- parisc_vmerge_boundary = IOVP_SIZE;
- parisc_vmerge_max_size = BITS_PER_LONG * IOVP_SIZE;
parisc_has_iommu();
return 0;
}
parisc_has_iommu();
return 0;
}