| commit | 6d99492c3e233fd7adeea5f37d5ca88e1c9e9cfa | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Oct 17 04:37:36 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Oct 17 04:37:33 2012 -0700 |
| tree | 090db6fddb427242c2679db1bdfa0fe195117e83 | |
| parent | a1c54e8df526ed47d995e20e42c5d9d4c92f2545 [diff] | |
| parent | e4229bdeab0b842a43e7fcd0085ce123f6877d0f [diff] |
Merge "msm: memory: Use already defined MT_MEMORY_SO type"
diff --git a/arch/arm/mach-msm/memory.c b/arch/arm/mach-msm/memory.c index 435f3be..8fdaf61 100644 --- a/arch/arm/mach-msm/memory.c +++ b/arch/arm/mach-msm/memory.c
@@ -62,7 +62,7 @@ map.pfn = __phys_to_pfn(phys); map.virtual = MSM_STRONGLY_ORDERED_PAGE; map.length = PAGE_SIZE; - map.type = MT_DEVICE_STRONGLY_ORDERED; + map.type = MT_MEMORY_SO; create_mapping(&map); printk(KERN_ALERT "Initialized strongly ordered page successfully\n");