diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:11 +0200 |
| commit | d4f8f217b8a5d5bd02af979650418dca4caec472 (patch) | |
| tree | af047bfa9729c975e24cb7624107574e884d3a57 /arch/arm/mach-s5pv310/cpu.c | |
| parent | 2dfbf4dfbe47a484bae20456c12b40763b9b6af7 (diff) | |
| parent | 773e3f93577ffb493fb7c39b1a6ecf39b5748e87 (diff) | |
| download | blackbird-op-linux-d4f8f217b8a5d5bd02af979650418dca4caec472.tar.gz blackbird-op-linux-d4f8f217b8a5d5bd02af979650418dca4caec472.zip | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
Diffstat (limited to 'arch/arm/mach-s5pv310/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c index 196c9f12ed85..e5b261a99ab2 100644 --- a/arch/arm/mach-s5pv310/cpu.c +++ b/arch/arm/mach-s5pv310/cpu.c @@ -45,6 +45,16 @@ static struct map_desc s5pv310_iodesc[] __initdata = { .pfn = __phys_to_pfn(S5PV310_PA_L2CC), .length = SZ_4K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_SYSRAM, + .pfn = __phys_to_pfn(S5PV310_PA_SYSRAM), + .length = SZ_4K, + .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_CMU, + .pfn = __phys_to_pfn(S5PV310_PA_CMU), + .length = SZ_128K, + .type = MT_DEVICE, }, }; |
