---

yaml --- r: 372127 b: refs/heads/master c: b361d61 h: refs/heads/master i: 372125: 1e2d8ec 372123: b006571 372119: b64dbfe 372111: 3cd6bf8 372095: add6ba4 v: v3
git-mirror · Apr 17, 2013 · 4bfaccd · 4bfaccd
1 parent 1356fc3
commit 4bfaccd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd0f67f4747797f36f0c6bab7fed6a1f2448476d
+refs/heads/master: b361d61dc1aaa9bdac0a0995e443c12146d916fd
diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/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.