From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LBAvC-0007SW-1M for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:31:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LBAvA-0007Rg-Hh for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:31:21 -0500 Received: from [199.232.76.173] (port=43315 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LBAvA-0007RZ-3y for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:31:20 -0500 Received: from mail-bw0-f12.google.com ([209.85.218.12]:49603) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LBAv9-0003TX-Ft for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:31:20 -0500 Received: by bwz5 with SMTP id 5so2180590bwz.10 for ; Fri, 12 Dec 2008 08:31:17 -0800 (PST) Message-ID: Date: Fri, 12 Dec 2008 18:27:23 +0200 From: "Blue Swirl" Subject: Re: [Qemu-devel] [5979] Fix compiling without MREMAP_FIXED In-Reply-To: <20081211193349.GA9054@epbyminw8406h.minsk.epam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20081211193349.GA9054@epbyminw8406h.minsk.epam.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On 12/11/08, Kirill A. Shutemov wrote: > On Thu, Dec 11, 2008 at 07:12:26PM +0000, Blue Swirl wrote: > > Revision: 5979 > > http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5979 > > Author: blueswir1 > > Date: 2008-12-11 19:12:25 +0000 (Thu, 11 Dec 2008) > > > > Log Message: > > ----------- > > Fix compiling without MREMAP_FIXED > > > > Modified Paths: > > -------------- > > trunk/linux-user/mmap.c > > > > Modified: trunk/linux-user/mmap.c > > =================================================================== > > --- trunk/linux-user/mmap.c 2008-12-11 17:30:50 UTC (rev 5978) > > +++ trunk/linux-user/mmap.c 2008-12-11 19:12:25 UTC (rev 5979) > > @@ -546,6 +546,7 @@ > > > > mmap_lock(); > > > > +#if defined(MREMAP_FIXED) > > if (flags & MREMAP_FIXED) > > host_addr = mremap(g2h(old_addr), old_size, new_size, > > flags, new_addr); > > @@ -560,7 +561,9 @@ > > } else > > host_addr = mremap(g2h(old_addr), old_size, new_size, > > flags | MREMAP_FIXED, g2h(mmap_start)); > > - } else { > > + } else > > +#endif > > + { > > host_addr = mremap(g2h(old_addr), old_size, new_size, flags); > > /* Check if address fits target address space */ > > if ((unsigned long)host_addr + new_size > (abi_ulong)-1) { > > > I've posted patch that fix building for glibc < 2.4. Please apply my > patch instead of it. Your fix depends on linux headers, is that safe?