projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into upstream-jgarzik
[powerpc.git]
/
include
/
asm-mips
/
io.h
diff --git
a/include/asm-mips/io.h
b/include/asm-mips/io.h
index
d77b657
..
b6a2eb8
100644
(file)
--- a/
include/asm-mips/io.h
+++ b/
include/asm-mips/io.h
@@
-115,7
+115,7
@@
static inline void set_io_port_base(unsigned long base)
*/
static inline unsigned long virt_to_phys(volatile const void *address)
{
*/
static inline unsigned long virt_to_phys(volatile const void *address)
{
- return (unsigned long)address - PAGE_OFFSET;
+ return (unsigned long)address - PAGE_OFFSET
+ PHYS_OFFSET
;
}
/*
}
/*
@@
-132,7
+132,7
@@
static inline unsigned long virt_to_phys(volatile const void *address)
*/
static inline void * phys_to_virt(unsigned long address)
{
*/
static inline void * phys_to_virt(unsigned long address)
{
- return (void *)(address + PAGE_OFFSET);
+ return (void *)(address + PAGE_OFFSET
- PHYS_OFFSET
);
}
/*
}
/*
@@
-555,12
+555,6
@@
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
*/
#define __ISA_IO_base ((char *)(isa_slot_offset))
*/
#define __ISA_IO_base ((char *)(isa_slot_offset))
-/*
- * We don't have csum_partial_copy_fromio() yet, so we cheat here and
- * just copy it. The net code will then do the checksum later.
- */
-#define eth_io_copy_and_sum(skb,src,len,unused) memcpy_fromio((skb)->data,(src),(len))
-
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that