Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 6826
b: refs/heads/master
c: e70bd11
h: refs/heads/master
v: v3
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Sep 2, 2005
1 parent 3f4f8c6 commit fd44485
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 8410a546765c10d929b82d1e8237398904a79283
refs/heads/master: e70bd1160109f2b7e62222550a7af37910dba88a
5 changes: 3 additions & 2 deletions trunk/include/asm-m68knommu/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ extern unsigned long memory_end;

#ifndef __ASSEMBLY__

#define __pa(vaddr) virt_to_phys((void *)vaddr)
#define __va(paddr) phys_to_virt((unsigned long)paddr)
#define __pa(vaddr) virt_to_phys((void *)(vaddr))
#define __va(paddr) phys_to_virt((unsigned long)(paddr))

#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
Expand All @@ -84,6 +84,7 @@ extern unsigned long memory_end;

#define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn))
#define page_to_pfn(page) virt_to_pfn(page_to_virt(page))
#define pfn_valid(pfn) ((pfn) < max_mapnr)

#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
((void *)(kaddr) < (void *)memory_end))
Expand Down

0 comments on commit fd44485

Please sign in to comment.