diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-14 15:32:12 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-14 15:32:12 -0800 |
| commit | b5cefc25cd04804027724059344840f98e851781 (patch) | |
| tree | 91064f55b6b36329d49a6104566aa5e419fa604c /drivers | |
| parent | 5a7997f3fb084ebf162f9481cd27bb2b1af390a5 (diff) | |
| parent | d5ed97e8e2d9e7a906c9917fff94e50adb8c2f19 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c index 262f1b9b357d..1a70f43d79f5 100644 --- a/drivers/video/tegra/nvmap/nvmap.c +++ b/drivers/video/tegra/nvmap/nvmap.c @@ -377,6 +377,7 @@ static int nvmap_reloc_pin_array(struct nvmap_client *client, unsigned long kaddr = (unsigned long)addr; set_pte_at(&init_mm, kaddr, *pte, pfn_pte(pfn, prot)); flush_tlb_kernel_page(kaddr); + last_pfn = pfn; } reloc_addr = handle_phys(pin) + arr[i].pin_offset; |