X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=lib%2Flmb.c;h=97e547037084dc22fc3fd93f5fd2aacd7419db02;hb=a1c8c4d1ff54c6c86930ee3c4c73c69eeb9ede61;hp=867f7b5a8231b9c2cc4fc81e1f269689259857e1;hpb=faa6cfde747ba6d37a0889cbe85881c80806d355;p=safe%2Fjmp%2Flinux-2.6

diff --git a/lib/lmb.c b/lib/lmb.c
index 867f7b5..97e54703 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -48,7 +48,8 @@ void lmb_dump_all(void)
 	}
 
 	pr_info("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
-	pr_info("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
+	pr_info("    reserved.size	  = 0x%llx\n",
+	    (unsigned long long)lmb.memory.size);
 	for (i=0; i < lmb.reserved.cnt ;i++) {
 		pr_info("    reserved.region[0x%lx].base       = 0x%llx\n",
 		    i, (unsigned long long)lmb.reserved.region[i].base);
@@ -461,6 +462,8 @@ void __init lmb_enforce_memory_limit(u64 memory_limit)
 	if (lmb.memory.region[0].size < lmb.rmo_size)
 		lmb.rmo_size = lmb.memory.region[0].size;
 
+	memory_limit = lmb_end_of_DRAM();
+
 	/* And truncate any reserves above the limit also. */
 	for (i = 0; i < lmb.reserved.cnt; i++) {
 		p = &lmb.reserved.region[i];