linux-mips
[Top] [All Lists]

[PATCH]: make highmem only things enclosed in the right #ifdef

To: linux mips mailing list <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH]: make highmem only things enclosed in the right #ifdef
From: Juan Quintela <quintela@mandrakesoft.com>
Date: 18 Dec 2002 02:42:59 +0100
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Hi
        a couple of variable declarations and a function declaration
        wasn't properly protected by #ifdefs.

Later, Juan.

Index: arch/mips/mm/init.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/init.c,v
retrieving revision 1.38.2.7
diff -u -r1.38.2.7 init.c
--- arch/mips/mm/init.c 5 Aug 2002 23:53:35 -0000       1.38.2.7
+++ arch/mips/mm/init.c 18 Dec 2002 00:49:19 -0000
@@ -161,6 +161,7 @@
 extern char _ftext, _etext, _fdata, _edata;
 extern char __init_begin, __init_end;
 
+#ifdef CONFIG_HIGHMEM
 static void __init fixrange_init (unsigned long start, unsigned long end,
        pgd_t *pgd_base)
 {
@@ -189,22 +190,25 @@
                j = 0;
        }
 }
+#endif /* CONFIG_HIGHMEM */
 
 void __init pagetable_init(void)
 {
+#ifdef CONFIG_HIGHMEM
        unsigned long vaddr;
-       pgd_t *pgd, *pgd_base;
        pmd_t *pmd;
        pte_t *pte;
-
+       pgd_t *pgd, pgd_base;
+#endif
        /* Initialize the entire pgd.  */
        pgd_init((unsigned long)swapper_pg_dir);
        pgd_init((unsigned long)swapper_pg_dir +
                 sizeof(pgd_t ) * USER_PTRS_PER_PGD);
 
-       pgd_base = swapper_pg_dir;
 
 #ifdef CONFIG_HIGHMEM
+       pgd_base = swapper_pg_dir;
+
        /*
         * Fixed mappings:
         */


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

<Prev in Thread] Current Thread [Next in Thread>