Misc fixes.

diff --git a/arch/ia64/hp/zx1/hpzx1_misc.c b/arch/ia64/hp/zx1/hpzx1_misc.c
index 1389dbc630670d24fb9d231050b0bd564905a97e..991f7b0dd24d6f1e57bacd8453c57e83830873d2 100644 (file)
--- a/arch/ia64/hp/zx1/hpzx1_misc.c
+++ b/arch/ia64/hp/zx1/hpzx1_misc.c
@@ -191,8 +191,8 @@ typedef struct {
 
 #define HP_CCSR_LENGTH 0x21
 #define HP_CCSR_TYPE 0x2
-#define HP_CCSR_GUID \
-    ((efi_guid_t) { 0x69e9adf9, 0x924f, 0xab5f, { 0xf6, 0x4a, 0x24, 0xd2, 0x01, 0x37, 0x0e, 0xad }})
+#define HP_CCSR_GUID EFI_GUID(0x69e9adf9, 0x924f, 0xab5f,                      \
+                             0xf6, 0x4a, 0x24, 0xd2, 0x01, 0x37, 0x0e, 0xad)
 
 extern acpi_status acpi_get_crs(acpi_handle, acpi_buffer *);
 extern acpi_resource *acpi_get_crs_next(acpi_buffer *, int *);
@@ -577,7 +577,7 @@ hpzx1_fake_pci_dev(unsigned long addr, unsigned int bus, unsigned int size)
         * Drivers should ioremap what they need, but we have to do
         * it here, too, so PCI config accesses work.
         */
-       dev->mapped_csrs = ioremap(dev->csr_base, dev->csr_size);
+       dev->mapped_csrs = (unsigned long) ioremap(dev->csr_base, dev->csr_size);
 
        return dev;
 }

diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 9f961ed9e455c86b2aeaae82fe651a027f6d3d95..5c7b4b193db45f4bce8675c6abf80c9952e855fc 100644 (file)
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -250,7 +250,7 @@ efi_map_pal_code (void)
                 * dedicated ITR for the PAL code.
                 */
                if ((vaddr & mask) == (KERNEL_START & mask)) {
-                       printk(__FUNCTION__ ": no need to install ITR for PAL code\n");
+                       printk("%s: no need to install ITR for PAL code\n", __FUNCTION__);
                        continue;
                }
 

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 8ea553a4b3970ce34e8d2c0c9537e5dacedce309..ea6021ae5514907dc3fe908abc0d4dea8d1b3beb 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -334,7 +334,7 @@ setup_arch (char **cmdline_p)
                printk("No I/O port range found in EFI memory map, falling back to AR.KR0\n");
                printk("I/O port base = 0x%lx\n", phys_iobase);
        }
-       ia64_iobase = ioremap(phys_iobase);
+       ia64_iobase = (unsigned long) ioremap(phys_iobase, 0);
 
 #ifdef CONFIG_SMP
        cpu_physical_id(0) = hard_smp_processor_id();