Return-Path: Received: from localhost (bix [127.0.0.1]) by localhost.localdomain (8.12.10/8.12.10) with ESMTP id j6V6EZHE017553 for ; Sat, 30 Jul 2005 23:14:35 -0700 Received: from bix [127.0.0.1] by localhost with POP3 (fetchmail-6.2.0) for akpm@localhost (single-drop); Sat, 30 Jul 2005 23:14:35 -0700 (PDT) Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j6V6BSIQ001509 for ; Sat, 30 Jul 2005 23:11:28 -0700 Received: from graphe.net (Debian-exim@graphe.net [209.204.138.32]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j6V6BRjA009467 (version=TLSv1/SSLv3 cipher=DES-CBC3-SHA bits=168 verify=NO) for ; Sat, 30 Jul 2005 23:11:28 -0700 Received: from christoph (helo=localhost) by graphe.net with local-esmtp (Exim 4.52) id 1Dz72i-0000XN-TI for akpm@osdl.org; Sat, 30 Jul 2005 23:11:26 -0700 Date: Sat, 30 Jul 2005 23:11:24 -0700 (PDT) From: Christoph Lameter X-X-Sender: christoph@graphe.net To: Andrew Morton Subject: Re: alpha still generates a warning In-Reply-To: <20050730223740.6a184e9e.akpm@osdl.org> Message-ID: References: <20050730183138.0d8b3df6.akpm@osdl.org> <20050730223740.6a184e9e.akpm@osdl.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Received-SPF: pass (domain of christoph@lameter.com designates 209.204.138.32 as permitted sender) X-MIMEDefang-Filter: osdl$Revision: 1.113 $ X-Scanned-By: MIMEDefang 2.36 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on bix X-Spam-Status: No, score=-1.7 required=2.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.2 X-Spam-Level: On Sat, 30 Jul 2005, Andrew Morton wrote: > nope. > > > CC arch/alpha/kernel/asm-offsets.s > In file included from include/asm/pgtable.h:365, > from include/asm/io.h:10, > from arch/alpha/kernel/asm-offsets.c:11: > include/asm-generic/pgtable.h:294:1: "pud_test_and_populate" redefined > In file included from include/asm/pgtable.h:4, > from include/asm/io.h:10, > from arch/alpha/kernel/asm-offsets.c:11: > include/asm-generic/4level-fixup.h:30:1: this is the location of the previous definition > Crap. Remove the definition of pud_test_and_populate (It is likely provided by the fallback on alpha) and just keep pgd_populate. I wish I had a way to run a compile on an alpha. Index: linux-2.6.13-rc4/include/asm-generic/4level-fixup.h =================================================================== --- linux-2.6.13-rc4.orig/include/asm-generic/4level-fixup.h 2005-07-30 19:20:08.000000000 -0700 +++ linux-2.6.13-rc4/include/asm-generic/4level-fixup.h 2005-07-30 23:11:12.000000000 -0700 @@ -26,6 +26,7 @@ #define pud_present(pud) 1 #define pud_ERROR(pud) do { } while (0) #define pud_clear(pud) pgd_clear(pud) +#define pud_populate pgd_populate #undef pud_free_tlb #define pud_free_tlb(tlb, x) do { } while (0)