[Xen-changelog] [xen master] arm: cast int<->pointer via uintptr_t

[patchbot@xxxxxxx]

commit b1d98d94d04cccc8703a4494abf23dbb9123b780
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri May 10 14:13:52 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri May 10 14:15:32 2013 +0100

    arm: cast int<->pointer via uintptr_t
    
    Fixes build on arm64:
    
    gic.c: In function â??gic_irq_eoiâ??:
            gic.c:726:16: error: cast from pointer to integer of different size 
[-Werror=pointer-to-int-cast]
            gic.c: In function â??maintenance_interruptâ??:
            gic.c:776:29: error: cast to pointer from integer of different size 
[-Werror=int-to-pointer-cast]
            gic.c:778:64: error: cast to pointer from integer of different size 
[-Werror=int-to-pointer-cast]
            cc1: all warnings being treated as errors
            make[3]: *** [gic.o] Error 1
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
    Acked-by: Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
---
 xen/arch/arm/gic.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 8d35e0e..9ebfebe 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -723,7 +723,7 @@ int gicv_setup(struct domain *d)
 
 static void gic_irq_eoi(void *info)
 {
-    int virq = (int) info;
+    int virq = (uintptr_t) info;
     GICC[GICC_DIR] = virq;
 }
 
@@ -773,9 +773,10 @@ static void maintenance_interrupt(int irq, void *dev_id, 
struct cpu_user_regs *r
             /* this is not racy because we can't receive another irq of the
              * same type until we EOI it.  */
             if ( cpu == smp_processor_id() )
-                gic_irq_eoi((void*)virq);
+                gic_irq_eoi((void*)(uintptr_t)virq);
             else
-                on_selected_cpus(cpumask_of(cpu), gic_irq_eoi, (void*)virq, 0);
+                on_selected_cpus(cpumask_of(cpu),
+                                 gic_irq_eoi, (void*)(uintptr_t)virq, 0);
         }
 
         i++;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog