---

yaml --- r: 177299 b: refs/heads/master c: d45e8db h: refs/heads/master i: 177297: 1769ecf 177295: 4668f21 v: v3
git-mirror · Dec 15, 2009 · d301d4a · d301d4a
1 parent d622c7e
commit d301d4a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c45c06596e0d45125d25beb0fe24a68aef1f1046
+refs/heads/master: d45e8db1b20c510a189d769d877af2e8e9df985f
diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/arch/blackfin/kernel/setup.c
@@ -601,11 +601,6 @@ static __init void memory_setup(void)
 	page_mask_order = get_order(3 * page_mask_nelts * sizeof(long));
 #endif
 
-#if !defined(CONFIG_MTD_UCLINUX)
-	/*In case there is no valid CPLB behind memory_end make sure we don't get to close*/
-	memory_end -= SIZE_4K;
-#endif
-
 	init_mm.start_code = (unsigned long)_stext;
 	init_mm.end_code = (unsigned long)_etext;
 	init_mm.end_data = (unsigned long)_edata;