Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5991
b: refs/heads/master
c: 40bb0c3
h: refs/heads/master
i:
  5989: 43fc4b8
  5987: a01c1a8
  5983: 19b9f43
v: v3
  • Loading branch information
Andreas Schwab authored and Linus Torvalds committed Aug 24, 2005
1 parent 3e876b8 commit 4257b9c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf
refs/heads/master: 40bb0c3ef52d872de348e10000eb5432a43a147d
6 changes: 3 additions & 3 deletions trunk/include/asm-m68k/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ extern unsigned long m68k_memoffset;
#define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset)
#define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset))
#else
#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))
#endif

#else /* !CONFIG_SUN3 */
/* This #define is a horrible hack to suppress lots of warnings. --m */
#define __pa(x) ___pa((unsigned long)x)
#define __pa(x) ___pa((unsigned long)(x))
static inline unsigned long ___pa(unsigned long x)
{
if(x == 0)
Expand Down

0 comments on commit 4257b9c

Please sign in to comment.