From owner-freebsd-emulation@FreeBSD.ORG Thu Mar 12 00:14:12 2009 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85D41106564A for ; Thu, 12 Mar 2009 00:14:12 +0000 (UTC) (envelope-from novembre@gmail.com) Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.28]) by mx1.freebsd.org (Postfix) with ESMTP id 3880D8FC20 for ; Thu, 12 Mar 2009 00:14:11 +0000 (UTC) (envelope-from novembre@gmail.com) Received: by yx-out-2324.google.com with SMTP id 31so174363yxl.13 for ; Wed, 11 Mar 2009 17:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=SkGa/Fwb8z5I4lKan5AXSXzZryuHy2WN4L5VDT6l75w=; b=H9BFDQ+BlyIed+zrkRvs7DSFfPSVsIwdsTSs9EojAB/XCK7alV3N6rR3TKk8AOzL4a grKibt0sqtwslUx1hFmcm522+616FcN14l9YjDKJLq1RXxsEIAsgFkmRdswWqkkkQVvX GfYKhFnzFZ8RHXMGET14HF7gGE3GQbuDQ3szk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=ki44k06DNFVYYDe9B7KUxCT0tHZRCit7w58Iwm1W3AmMxazT6YhxP/EsJT0DZvLJ6D D5k0GM9BDCZIXXbd1TAYMFt8/bfj+xqdS7JRYckoOI85QFprT6uOqrqxWb7/5MYbpdHo N5tNktr4TR4sStWp0E/s6rGswt15ogEZDIEMA= MIME-Version: 1.0 Received: by 10.220.99.17 with SMTP id s17mr3715451vcn.0.1236816851279; Wed, 11 Mar 2009 17:14:11 -0700 (PDT) In-Reply-To: <20090304084315.587314cev8vm3f34@webmail.leidinger.net> References: <3b47caa90903021351g4ceb832ap866cccd940cfb68b@mail.gmail.com> <20090303083430.64927hdcfxdcmjok@webmail.leidinger.net> <3b47caa90903031841m75eb3553jdd38cc47972990cc@mail.gmail.com> <20090304084315.587314cev8vm3f34@webmail.leidinger.net> Date: Wed, 11 Mar 2009 19:14:11 -0500 Message-ID: <3b47caa90903111714p4b82f672t6597b4fa84cc2ba6@mail.gmail.com> From: Novembre To: Alexander Leidinger Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-emulation@freebsd.org Subject: Re: Flash 9 crash problems X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 00:14:12 -0000 On Wed, Mar 4, 2009 at 2:43 AM, Alexander Leidinger wrote: > Quoting Novembre (from Tue, 3 Mar 2009 20:41:03 > -0600): > > I found two posts containing patches regarding this issue: >> 1) >> >> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+archive/2008/freebsd-emulation/20081228.freebsd-emulation >> 2) >> >> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+archive/2009/freebsd-emulation/20090215.freebsd-emulation >> >> The first post contains two patches, of which one is marked specifically >> for >> 7-STABLE (as of Dec 21, 2008 when the patches were made available). The >> second post also has a patch, but I don't know whether it is for 8-CURRENT >> or 7-STABLE. Which one should I apply? >> > > If you do not want to wait: the patch utility has the option "-C" which > just tries to apply the patch but does not really apply it. This way you can > see if a patch is applicable to what you have or not. This way you can test > if one of all those patches applies at all to what you have. In the worst > case it applies, but you get a kernel panic upon use of some linux stuff > (you may lose data because of this). In the best case at least one applies > and it works perfectly. > > Bye, > Alexander. > > -- > If we see the light at the end of the tunnel > It's the light of an oncoming train. > -- Robert Lowell > > > http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 > http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 > I copied both files to /usr/src/sys/ and tried patching with -C option. It asks me a question about which file to patch! Here's the result: #pwd /usr/src/sys #patch -C < futexes_partial_II.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c |index 4f6d178..0aea61d 100644 |--- a/sys/amd64/amd64/elf_machdep.c |+++ b/sys/amd64/amd64/elf_machdep.c -------------------------- File to patch: # patch -C < mega-st7.linux.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h |index 0a386be..3c2cd20 100644 |--- a/sys/amd64/include/elf.h |+++ b/sys/amd64/include/elf.h -------------------------- File to patch: I have no idea what to tell it, so I just press Ctrl-C to cancel the command. Any ideas? Thanks