Merge bk://24.221.152.185/linux-2.5-8xxcleanup

into quango.ozlabs.ibm.com:/home/paulus/kernel/for-linus-ppc

arch/ppc/boot/ld.script

@@ -44,6 +44,7 @@ SECTIONS
   {
     *(.data)
     *(.data1)
+    *(.data.boot)
     *(.sdata)
     *(.sdata2)
     *(.got.plt) *(.got)

arch/ppc/boot/simple/misc-embedded.c

@@ -59,7 +59,9 @@ char netroot_string[] = "root=/dev/nfs rw ip=auto";
 /* Serial port to use. */
 unsigned long com_port;
 
-bd_t hold_resid_buf;
+/* We need to make sure that this is before the images to ensure
+ * that it's in a mapped location. - Tom */
+bd_t hold_resid_buf __attribute__ ((__section__ (".data.boot")));
 bd_t *hold_residual = &hold_resid_buf;
 
 extern unsigned long serial_init(int chan, bd_t *bp);

arch/ppc/mm/cachemap.c

@@ -157,6 +157,6 @@ size_t size, int direction)
 {
 	unsigned long start;
 
-	start = (unsigned long)(page->virtual) + offset; 
+	start = page_address(page) + offset;
 	consistent_sync(start, size, direction);
 }