Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74851
b: refs/heads/master
c: b87bb40
h: refs/heads/master
i:
  74849: 0f22ec7
  74847: 5551ffc
v: v3
  • Loading branch information
Sergei Shtylyov authored and Ralf Baechle committed Dec 14, 2007
1 parent 206b292 commit 9fcc51b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: dd99d9661c72fe251b842705f2e7cfaa4918a13c
refs/heads/master: b87bb40b62310328e908d580e013e0575b05886c
9 changes: 4 additions & 5 deletions trunk/arch/mips/au1000/common/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,11 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)

#ifdef CONFIG_PCI
{
u32 start, end;
u32 start = (u32)Au1500_PCI_MEM_START;
u32 end = (u32)Au1500_PCI_MEM_END;

start = (u32)Au1500_PCI_MEM_START;
end = (u32)Au1500_PCI_MEM_END;
/* check for pci memory window */
if ((phys_addr >= start) && ((phys_addr + size) < end))
/* Check for PCI memory window */
if (phys_addr >= start && (phys_addr + size - 1) <= end)
return (phys_t)
((phys_addr - start) + Au1500_PCI_MEM_START);
}
Expand Down

0 comments on commit 9fcc51b

Please sign in to comment.