From 11101d05f9b2e117a7f32579b5e2b14a48c1473d Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 6 Feb 2008 01:36:30 -0800 Subject: [PATCH] --- yaml --- r: 83393 b: refs/heads/master c: 870b8f8c43d000bb321b42a12212facc1087a748 h: refs/heads/master i: 83391: 12674d51df45eec62dec544202960ce7e79ba72b v: v3 --- [refs] | 2 +- trunk/include/asm-blackfin/io.h | 2 -- trunk/include/asm-h8300/io.h | 2 -- trunk/include/asm-h8300/virtconvert.h | 2 -- trunk/include/asm-m68knommu/io.h | 2 -- trunk/include/asm-v850/io.h | 2 -- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0c1cb11eac92..086a3ce1a9c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b892806b09dca77db8ef6acbb6c51271578d34d +refs/heads/master: 870b8f8c43d000bb321b42a12212facc1087a748 diff --git a/trunk/include/asm-blackfin/io.h b/trunk/include/asm-blackfin/io.h index 1601d62f39a5..574fe56989d1 100644 --- a/trunk/include/asm-blackfin/io.h +++ b/trunk/include/asm-blackfin/io.h @@ -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)) diff --git a/trunk/include/asm-h8300/io.h b/trunk/include/asm-h8300/io.h index 7543a57b4ea1..26dc6ccd9441 100644 --- a/trunk/include/asm-h8300/io.h +++ b/trunk/include/asm-h8300/io.h @@ -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)) diff --git a/trunk/include/asm-h8300/virtconvert.h b/trunk/include/asm-h8300/virtconvert.h index ee7d5ea10065..19cfd62b11c3 100644 --- a/trunk/include/asm-h8300/virtconvert.h +++ b/trunk/include/asm-h8300/virtconvert.h @@ -10,8 +10,6 @@ #include #include -#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)) diff --git a/trunk/include/asm-m68knommu/io.h b/trunk/include/asm-m68knommu/io.h index 653d9b2d7ddf..6adef1ee2082 100644 --- a/trunk/include/asm-m68knommu/io.h +++ b/trunk/include/asm-m68knommu/io.h @@ -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)) diff --git a/trunk/include/asm-v850/io.h b/trunk/include/asm-v850/io.h index cc364fcbec10..cdad251fba9f 100644 --- a/trunk/include/asm-v850/io.h +++ b/trunk/include/asm-v850/io.h @@ -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))