diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2013-04-09 13:37:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-04-17 16:55:01 +0100 |
| commit | b361d61dc1aaa9bdac0a0995e443c12146d916fd (patch) | |
| tree | 4b7ecbb3a316bbb6234273e72eb4b7aea8816227 /arch/arm/mm | |
| parent | dd0f67f4747797f36f0c6bab7fed6a1f2448476d (diff) | |
| download | linux-3.10-b361d61dc1aaa9bdac0a0995e443c12146d916fd.tar.gz linux-3.10-b361d61dc1aaa9bdac0a0995e443c12146d916fd.tar.bz2 linux-3.10-b361d61dc1aaa9bdac0a0995e443c12146d916fd.zip | |
ARM: 7695/1: mvebu: Enable pj4b on LPAE compilations
pj4b cpus are LPAE capable so enable them on LPAE compilations
Signed-off-by: Lior Amsalem <alior@marvell.com>
Tested-by: Franklin <flin@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 37716b0508e..4fa28acaf7f 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -402,6 +402,8 @@ __v7_ca9mp_proc_info: __v7_proc __v7_ca9mp_setup .size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info +#endif /* CONFIG_ARM_LPAE */ + /* * Marvell PJ4B processor. */ @@ -411,7 +413,6 @@ __v7_pj4b_proc_info: .long 0xfffffff0 __v7_proc __v7_pj4b_setup .size __v7_pj4b_proc_info, . - __v7_pj4b_proc_info -#endif /* CONFIG_ARM_LPAE */ /* * ARM Ltd. Cortex A7 processor. |