[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-arm-kernel
Subject:    2.5.70-rmk1-pxa1: more probs with gcc
From:       Holger Schurig <holgerschurig () gmx ! de>
Date:       2003-07-12 6:15:49
[Download RAW message or body]

Nico, the following made cpu-pca.c compile with gcc2.95.3.

So, now I'm looking at pxafb.c

--- linux-2.5.70/arch/arm/mach-pxa/cpu-pxa.c~ramses
+++ linux-2.5.70/arch/arm/mach-pxa/cpu-pxa.c
@@ -141,6 +141,7 @@
     unsigned long flags;
     unsigned int unused;
     unsigned int preset_mdrefr, postset_mdrefr;
+    void *ramstart;
 
     /*
      * Save this threads cpus_allowed mask.
@@ -187,7 +188,7 @@
             (pxa_freq_settings[idx].membus/1000));
     }
 
-    void *ramstart = phys_to_virt(0xa0000000);
+    ramstart = phys_to_virt(0xa0000000);
 
     /* 
      * Tell everyone what we're about to do... 
@@ -224,21 +225,21 @@
     /* Set new the CCCR */
     CCCR = pxa_freq_settings[idx].cccr;
 
-    __asm__ __volatile__("                                  \
-        ldr r4, [%1] ;  /* load MDREFR */                   \
-        b   2f ;                                            \
-        .align  5 ;                                         \
-1:                                                          \
-        str %4, [%1] ;          /* preset the MDREFR */     \
-        mcr p14, 0, %2, c6, c0, 0 ; /* set CCLKCFG[FCS] */  \
-        str %5, [%1] ;          /* postset the MDREFR */    \
-                                                            \
-        b   3f       ;                                      \
-2:      b   1b       ;                                      \
-3:      nop          ;                                      \
+    __asm__ __volatile__("
+        ldr r4, [%1] ;  /* load MDREFR */
+        b   2f ;
+        .align  5 ;
+1:
+        str %4, [%1] ;          /* preset the MDREFR */
+        mcr p14, 0, %2, c6, c0, 0 ; /* set CCLKCFG[FCS] */
+        str %5, [%1] ;          /* postset the MDREFR */
+
+        b   3f       ;
+2:      b   1b       ;
+3:      nop          ;
         "                                                                            
         : "=&r" (unused)                                                             
-        : "r" (&MDREFR), "r" (CCLKCFG_TURBO|CCLKCFG_FCS), "r" (ramstart), \
+        : "r" (&MDREFR), "r" (CCLKCFG_TURBO|CCLKCFG_FCS), "r" (ramstart),
           "r" (preset_mdrefr), "r" (postset_mdrefr)             
         : "r4", "r5");
     local_irq_restore(flags);

-------------------------------------------------------------------
Subscription options: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ/Etiquette:       http://www.arm.linux.org.uk/armlinux/mailinglists.php

[prev in list] [next in list] [prev in thread] [next in thread]