Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331495
b: refs/heads/master
c: a3d7193
h: refs/heads/master
i:
  331493: 6b2bb5c
  331491: e2cc891
  331487: aff95ee
v: v3
  • Loading branch information
Russell King committed Sep 28, 2012
1 parent 0409bf7 commit 6b7d1ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c564df4db85aac8d1d65a56176a0a25f46138064
refs/heads/master: a3d7193e3c5d0b2365b9247ef0d4cb549187f32f
1 change: 1 addition & 0 deletions trunk/arch/arm/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
if (!area)
return NULL;
addr = (unsigned long)area->addr;
area->phys_addr = __pfn_to_phys(pfn);

#if !defined(CONFIG_SMP) && !defined(CONFIG_ARM_LPAE)
if (DOMAIN_IO == 0 &&
Expand Down

0 comments on commit 6b7d1ea

Please sign in to comment.