Merge branch 'cpus4096' into irq/threaded

Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 3ab3e4a41d67..7b7ddc2d51c9 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -938,8 +938,8 @@ static int __init ibft_init(void)
                 return -ENOMEM;
 
         if (ibft_addr) {
-                printk(KERN_INFO "iBFT detected at 0x%lx.\n",
-                       virt_to_phys((void *)ibft_addr));
+                printk(KERN_INFO "iBFT detected at 0x%llx.\n",
+                       (u64)virt_to_phys((void *)ibft_addr));
 
                 rc = ibft_check_device();
                 if (rc)