CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/01/08 00:44:19

Modified files:
        arch/mips/kernel: setup.c 

Log message:
        Kernels in XKPHYS won't like CPHYSADDR.

diff -urN linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
--- linux/arch/mips/kernel/setup.c      2005/01/07 19:57:33     1.177
+++ linux/arch/mips/kernel/setup.c      2005/01/08 00:44:19     1.178
@@ -443,10 +443,21 @@
 {
        int i;
 
+#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
+       /*
+        * The 64bit code in 32bit object format trick can't represent
+        * 64bit wide relocations for linker script symbols.
+        */
        code_resource.start = CPHYSADDR(&_text);
        code_resource.end = CPHYSADDR(&_etext) - 1;
        data_resource.start = CPHYSADDR(&_etext);
        data_resource.end = CPHYSADDR(&_edata) - 1;
+#else
+       code_resource.start = virt_to_phys(&_text);
+       code_resource.end = virt_to_phys(&_etext) - 1;
+       data_resource.start = virt_to_phys(&_etext);
+       data_resource.end = virt_to_phys(&_edata) - 1;
+#endif
 
        /*
         * Request address space for all standard RAM.