From patchwork Wed Apr 11 14:16:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schmidt X-Patchwork-Id: 151801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id BC330B7024 for ; Thu, 12 Apr 2012 00:19:18 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1334758760; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=5gH348E Jruc0GreXlgVHYrIzmxo=; b=rycYDXYvrMcB+Z5cihdeeOh+VQhPGVVjN6T2Fb/ mK70Gv2iTslAUmyBniuvcSQZGOfPM8jDqow6EPcZbyUb1mVkHFI+lRZUNau4IkhP MON0sdFfXOIV3JsbbCrICJGl8TXNxa2mTUKFmgsXReaELkVZtJ97lV4OfBV32iC9 cdss= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=eGczHWVw4ovGWA4ecuBwwPVioF6ZT4DbR3HJyhJQ6VGnntbDefg3gQtT4ax1Vg gKiotQBQNGYhQSrvHIDLWvbJv5bAg8fb/dnCt8Qo2L2baV8hN2EYs70viapqkKgj KjodEhu06YeTRfPcpuKm7mTR7ZzWAaK1jookaDtYcQ3gk=; Received: (qmail 18621 invoked by alias); 11 Apr 2012 14:19:15 -0000 Received: (qmail 18613 invoked by uid 22791); 11 Apr 2012 14:19:13 -0000 X-SWARE-Spam-Status: No, hits=-3.4 required=5.0 tests=AWL, BAYES_00, FROM_12LTRDOM, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 11 Apr 2012 14:19:01 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1SHyNw-00022M-DU from Bernd_Schmidt@mentor.com for gcc-patches@gcc.gnu.org; Wed, 11 Apr 2012 07:19:00 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 11 Apr 2012 07:19:00 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Wed, 11 Apr 2012 15:18:58 +0100 Message-ID: <4F859244.9060600@codesourcery.com> Date: Wed, 11 Apr 2012 16:16:36 +0200 From: Bernd Schmidt User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.20) Gecko/20110920 Lightning/1.0b3pre Thunderbird/3.1.12 MIME-Version: 1.0 To: GCC Patches Subject: Change initialization order in sel-sched Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The order of calls to sched_rgn_init and sched_init differs between sched-rgn and sel-sched. This caused a scheduler patch I was working on to segfault once sel-sched was enabled. The following patch swaps the two function calls. Bootstrapped & tested on i686-linux. Ok? Bernd * sel-sched.c (sel_global_init): Swap order of sched_rgn_init and sched_init calls. Index: gcc/sel-sched.c =================================================================== --- gcc/sel-sched.c (revision 364953) +++ gcc/sel-sched.c (working copy) @@ -7616,8 +7616,8 @@ sel_global_init (void) sel_setup_sched_infos (); setup_sched_dump (); - sched_rgn_init (false); sched_init (); + sched_rgn_init (false); sched_init_bbs (); /* Reset AFTER_RECOVERY if it has been set by the 1st scheduler pass. */