Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83393
b: refs/heads/master
c: 870b8f8
h: refs/heads/master
i:
  83391: 12674d5
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Feb 6, 2008
1 parent 347a82c commit 11101d0
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b892806b09dca77db8ef6acbb6c51271578d34d
refs/heads/master: 870b8f8c43d000bb321b42a12212facc1087a748
2 changes: 0 additions & 2 deletions trunk/include/asm-blackfin/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,6 @@ extern void blkfin_inv_cache_all(void);
#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT)
#define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT)

#define mm_ptov(vaddr) ((void *) (vaddr))
#define mm_vtop(vaddr) ((unsigned long) (vaddr))
#define phys_to_virt(vaddr) ((void *) (vaddr))
#define virt_to_phys(vaddr) ((unsigned long) (vaddr))

Expand Down
2 changes: 0 additions & 2 deletions trunk/include/asm-h8300/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,6 @@ static __inline__ void ctrl_outl(unsigned long b, unsigned long addr)
/*
* Macros used for converting between virtual and physical mappings.
*/
#define mm_ptov(vaddr) ((void *) (vaddr))
#define mm_vtop(vaddr) ((unsigned long) (vaddr))
#define phys_to_virt(vaddr) ((void *) (vaddr))
#define virt_to_phys(vaddr) ((unsigned long) (vaddr))

Expand Down
2 changes: 0 additions & 2 deletions trunk/include/asm-h8300/virtconvert.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#include <asm/setup.h>
#include <asm/page.h>

#define mm_ptov(vaddr) ((void *) (vaddr))
#define mm_vtop(vaddr) ((unsigned long) (vaddr))
#define phys_to_virt(vaddr) ((void *) (vaddr))
#define virt_to_phys(vaddr) ((unsigned long) (vaddr))

Expand Down
2 changes: 0 additions & 2 deletions trunk/include/asm-m68knommu/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ extern void iounmap(void *addr);
/*
* Macros used for converting between virtual and physical mappings.
*/
#define mm_ptov(vaddr) ((void *) (vaddr))
#define mm_vtop(vaddr) ((unsigned long) (vaddr))
#define phys_to_virt(vaddr) ((void *) (vaddr))
#define virt_to_phys(vaddr) ((unsigned long) (vaddr))

Expand Down
2 changes: 0 additions & 2 deletions trunk/include/asm-v850/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ outsl (unsigned long port, const void *src, unsigned long count)
#endif

/* Conversion between virtual and physical mappings. */
#define mm_ptov(addr) ((void *)__phys_to_virt (addr))
#define mm_vtop(addr) ((unsigned long)__virt_to_phys (addr))
#define phys_to_virt(addr) ((void *)__phys_to_virt (addr))
#define virt_to_phys(addr) ((unsigned long)__virt_to_phys (addr))

Expand Down

0 comments on commit 11101d0

Please sign in to comment.