[PATCH] FRV: Fix FRV arch compile errors

Fix some FRV arch compile errors, including:

 (*) Marking nr_kernel_pages as __meminitdata so that references to it end up
     being properly calculated rather than being assumed to be in the small
     data section (and thus calculated wrt the GP register).  Not doing this
     causes the linker to emit errors as the offset is too big to fit into the
     load instruction.

 (*) Move pm_power_off into an unconditionally compiled .c file as it's now
     unconditionally accessed.

 (*) Declare frv_change_cmode() in a header file rather than in a .c file, and
     declare it asmlinkage.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index fb98e90c579..f7279d78995 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -406,7 +406,9 @@ int __init pcibios_init(void)
         ioport_resource.end     = (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff;
         ioport_resource.end     += ioport_resource.start;
 
-        printk("PCI IO window:  %08lx-%08lx\n", ioport_resource.start, ioport_resource.end);
+        printk("PCI IO window:  %08llx-%08llx\n",
+               (unsigned long long) ioport_resource.start,
+               (unsigned long long) ioport_resource.end);
 
         iomem_resource.start    = (__reg_MB86943_sl_pci_mem_base << 9) & 0xfffffc00;
 
@@ -416,8 +418,11 @@ int __init pcibios_init(void)
         iomem_resource.end      = (__reg_MB86943_sl_pci_mem_range << 9) | 0x3ff;
         iomem_resource.end      += iomem_resource.start;
 
-        printk("PCI MEM window: %08lx-%08lx\n", iomem_resource.start, iomem_resource.end);
-        printk("PCI DMA memory: %08lx-%08lx\n", dma_coherent_mem_start, dma_coherent_mem_end);
+        printk("PCI MEM window: %08llx-%08llx\n",
+               (unsigned long long) iomem_resource.start,
+               (unsigned long long) iomem_resource.end);
+        printk("PCI DMA memory: %08lx-%08lx\n",
+               dma_coherent_mem_start, dma_coherent_mem_end);
 
         if (!pci_probe)
                 return -ENXIO;