git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
include
/
linux
/
io-mapping.h
diff --git
a/include/linux/io-mapping.h
b/include/linux/io-mapping.h
index
7fb5927
..
8cdcc2a
100644
(file)
--- a/
include/linux/io-mapping.h
+++ b/
include/linux/io-mapping.h
@@
-81,8
+81,7
@@
io_mapping_free(struct io_mapping *mapping)
/* Atomic map/unmap */
static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping,
/* Atomic map/unmap */
static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping,
- unsigned long offset,
- int slot)
+ unsigned long offset)
{
resource_size_t phys_addr;
unsigned long pfn;
{
resource_size_t phys_addr;
unsigned long pfn;
@@
-90,13
+89,13
@@
io_mapping_map_atomic_wc(struct io_mapping *mapping,
BUG_ON(offset >= mapping->size);
phys_addr = mapping->base + offset;
pfn = (unsigned long) (phys_addr >> PAGE_SHIFT);
BUG_ON(offset >= mapping->size);
phys_addr = mapping->base + offset;
pfn = (unsigned long) (phys_addr >> PAGE_SHIFT);
- return iomap_atomic_prot_pfn(pfn,
slot,
mapping->prot);
+ return iomap_atomic_prot_pfn(pfn, mapping->prot);
}
static inline void
}
static inline void
-io_mapping_unmap_atomic(void __iomem *vaddr
, int slot
)
+io_mapping_unmap_atomic(void __iomem *vaddr)
{
{
- iounmap_atomic(vaddr
, slot
);
+ iounmap_atomic(vaddr);
}
static inline void __iomem *
}
static inline void __iomem *
@@
-137,14
+136,13
@@
io_mapping_free(struct io_mapping *mapping)
/* Atomic map/unmap */
static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping,
/* Atomic map/unmap */
static inline void __iomem *
io_mapping_map_atomic_wc(struct io_mapping *mapping,
- unsigned long offset,
- int slot)
+ unsigned long offset)
{
return ((char __force __iomem *) mapping) + offset;
}
static inline void
{
return ((char __force __iomem *) mapping) + offset;
}
static inline void
-io_mapping_unmap_atomic(void __iomem *vaddr
, int slot
)
+io_mapping_unmap_atomic(void __iomem *vaddr)
{
}
{
}