Commit a23cf970 authored by Paul Mackerras's avatar Paul Mackerras

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

into quango.ozlabs.ibm.com:/home/paulus/kernel/for-linus-ppc
parents a814d16f d24be85e
...@@ -44,6 +44,7 @@ SECTIONS ...@@ -44,6 +44,7 @@ SECTIONS
{ {
*(.data) *(.data)
*(.data1) *(.data1)
*(.data.boot)
*(.sdata) *(.sdata)
*(.sdata2) *(.sdata2)
*(.got.plt) *(.got) *(.got.plt) *(.got)
......
...@@ -59,7 +59,9 @@ char netroot_string[] = "root=/dev/nfs rw ip=auto"; ...@@ -59,7 +59,9 @@ char netroot_string[] = "root=/dev/nfs rw ip=auto";
/* Serial port to use. */ /* Serial port to use. */
unsigned long com_port; 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; bd_t *hold_residual = &hold_resid_buf;
extern unsigned long serial_init(int chan, bd_t *bp); extern unsigned long serial_init(int chan, bd_t *bp);
......
...@@ -157,6 +157,6 @@ size_t size, int direction) ...@@ -157,6 +157,6 @@ size_t size, int direction)
{ {
unsigned long start; unsigned long start;
start = (unsigned long)(page->virtual) + offset; start = page_address(page) + offset;
consistent_sync(start, size, direction); consistent_sync(start, size, direction);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment