From af3fcf12af1c4ec83c231e9e07769f370b5ca2ac Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Wed, 2 Dec 2009 00:30:45 +0000
Subject: 2009-12-01	Till Straumann <strauman@slac.stanford.edu>

	* shared/startup/probeMemEnd.c: removed __here_s_the_real_end
	check. __rtems_end should be good enough.
---
 c/src/lib/libbsp/powerpc/ChangeLog                    |  5 +++++
 c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c | 11 +----------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index 1e4d75e365..e8b7ca6af7 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-01	Till Straumann <strauman@slac.stanford.edu>
+
+	* shared/startup/probeMemEnd.c: removed __here_s_the_real_end
+	check. __rtems_end should be good enough.
+
 2009-11-11	Till Straumann <strauman@slac.stanford.edu>
 
 	* shared/start/start.S: Align initial stack to
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c
index f90d9bc06e..6620c7d581 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c
@@ -90,8 +90,6 @@ extern uint32_t __rtems_end[];
 #define __DO_ALIGN(a, s)	(((uint32_t)(a) + (s)-1) & ~((s)-1))
 #define __ALIGN(a)	__DO_ALIGN(a, (1<<LD_MEM_PROBE_STEP))
 
-extern void __here_s_the_real_end(void);
-
 #define SWITCH_MSR(msr)		\
 	do {					\
 	register uint32_t __rr;	\
@@ -185,15 +183,10 @@ register          uint32_t flags;
 	 * even probe our own stack :-)
 	 */
 
-	/* are we really at the highest address ? */
-	if ( probe < (volatile uint32_t *)__here_s_the_real_end ) {
-		probe = (volatile uint32_t*)__ALIGN(__here_s_the_real_end);
-	}
-
 	if ( CPU_lockUnlockCaches(1) )
 		return 0;
 
-	asm volatile("mfmsr %0":"=r"(flags));
+	_CPU_MSR_GET(flags);
 
 	SWITCH_MSR( flags & ~(MSR_EE|MSR_DR|MSR_IR) );
 
@@ -225,5 +218,3 @@ register          uint32_t flags;
 
 	return (uint32_t) probe;
 }
-
-void __here_s_the_real_end(void) {}
-- 
cgit v1.2.3