linux-mips
[Top] [All Lists]

[PATCH]: flags have to be unsigned long

To: Ralf Baechle <ralf@linux-mips.org>, mipslist <linux-mips@linux-mips.org>
Subject: [PATCH]: flags have to be unsigned long
From: Juan Quintela <quintela@mandrakesoft.com>
Date: 20 Dec 2002 20:13:18 +0100
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Hi
        more occurrences where flags are declared as int.
        In a couple of places I move the declaration to its
        corresponding ifdef.

Later, Juan.

Index: arch/mips/mm/c-r4k.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/c-r4k.c,v
retrieving revision 1.3.2.16
diff -u -r1.3.2.16 c-r4k.c
--- arch/mips/mm/c-r4k.c        20 Dec 2002 03:08:32 -0000      1.3.2.16
+++ arch/mips/mm/c-r4k.c        20 Dec 2002 18:39:46 -0000
@@ -948,12 +948,13 @@
 static void r4k_dma_cache_wback_inv_pc(unsigned long addr, unsigned long size)
 {
        unsigned long end, a;
-       unsigned int flags;
 
        if (size >= dcache_size) {
                flush_cache_all();
        } else {
 #ifdef R4600_V2_HIT_CACHEOP_WAR
+               unsigned long flags;
+
                /* Workaround for R4600 bug.  See comment in <asm/war>. */
                local_irq_save(flags);
                *(volatile unsigned long *)KSEG1;
@@ -994,12 +995,13 @@
 static void r4k_dma_cache_inv_pc(unsigned long addr, unsigned long size)
 {
        unsigned long end, a;
-       unsigned int flags;
 
        if (size >= dcache_size) {
                flush_cache_all();
        } else {
 #ifdef R4600_V2_HIT_CACHEOP_WAR
+               unsigned long flags;
+
                /* Workaround for R4600 bug.  See comment in <asm/war>. */
                local_irq_save(flags);
                *(volatile unsigned long *)KSEG1;
Index: arch/mips64/mm/c-mips64.c
===================================================================
RCS file: /home/cvs/linux/arch/mips64/mm/c-mips64.c,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 c-mips64.c
--- arch/mips64/mm/c-mips64.c   18 Dec 2002 22:23:59 -0000      1.1.2.6
+++ arch/mips64/mm/c-mips64.c   20 Dec 2002 18:39:48 -0000
@@ -316,7 +316,7 @@
 mips64_dma_cache_wback_inv_pc(unsigned long addr, unsigned long size)
 {
        unsigned long end, a;
-       unsigned int flags;
+       unsigned long flags;
 
        if (size >= (unsigned long)dcache_size) {
                blast_dcache();
@@ -357,7 +357,7 @@
 mips64_dma_cache_inv_pc(unsigned long addr, unsigned long size)
 {
        unsigned long end, a;
-       unsigned int flags;
+       unsigned long flags;
 
        if (size >= (unsigned long)dcache_size) {
                blast_dcache();
Index: arch/mips64/mm/c-r4k.c
===================================================================
RCS file: /home/cvs/linux/arch/mips64/mm/c-r4k.c,v
retrieving revision 1.1.2.10
diff -u -r1.1.2.10 c-r4k.c
--- arch/mips64/mm/c-r4k.c      20 Dec 2002 03:08:32 -0000      1.1.2.10
+++ arch/mips64/mm/c-r4k.c      20 Dec 2002 18:39:48 -0000
@@ -1065,7 +1070,7 @@
 static void r4600v20k_flush_cache_sigtramp(unsigned long addr)
 {
 #ifdef R4600_V2_HIT_CACHEOP_WAR
-       unsigned int flags;
+       unsigned long flags;
 
        local_irq_save(flags);
 
Index: arch/mips64/mm/pg-r4k.c
===================================================================
RCS file: /home/cvs/linux/arch/mips64/mm/pg-r4k.c,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 pg-r4k.c
--- arch/mips64/mm/pg-r4k.c     30 Sep 2002 16:53:55 -0000      1.1.2.2
+++ arch/mips64/mm/pg-r4k.c     20 Dec 2002 18:39:48 -0000
@@ -157,7 +157,7 @@
  */
 void r4k_clear_page_r4600_v2(void * page)
 {
-       unsigned int flags;
+       unsigned long flags;
 
        __save_and_cli(flags);
        *(volatile unsigned int *)KSEG1;
@@ -432,7 +432,7 @@
 void r4k_copy_page_r4600_v2(void * to, void * from)
 {
        unsigned long dummy1, dummy2, reg1, reg2;
-       unsigned int flags;
+       unsigned long flags;
 
        __save_and_cli(flags);
        __asm__ __volatile__(

-- 
In theory, practice and theory are the same, but in practice they 
are different -- Larry McVoy

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH]: flags have to be unsigned long, Juan Quintela <=