From owner-svn-src-head@FreeBSD.ORG  Thu Aug  7 17:00:50 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C2289B64
 for <svn-src-head@freebsd.org>; Thu,  7 Aug 2014 17:00:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93E8B2848
 for <svn-src-head@freebsd.org>; Thu,  7 Aug 2014 17:00:50 +0000 (UTC)
Received: from royger (uid 1332) (envelope-from royger@FreeBSD.org) id 25ff
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 17:00:50 +0000
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Thu, 7 Aug 2014 17:00:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269675 - head/sys/x86/isa
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e3b0c2.25ff.29ca9019@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2014 17:00:50 -0000

Author: royger
Date: Thu Aug  7 17:00:50 2014
New Revision: 269675
URL: http://svnweb.freebsd.org/changeset/base/269675

Log:
  atpic: make sure atpic_init is called after IO APIC initialization
  
  After r269510 the IO APIC and ATPIC initialization is done at the same
  order, which means atpic_init can be called before the IO APIC has
  been initalized. In that case the ATPIC will take over the interrupt
  sources, preventing the IO APIC from registering them.
  
  Reported by: David Wolfskill <david@catwhisker.org>
  Tested by: David Wolfskill <david@catwhisker.org>,
             Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>
  Sponsored by: Citrix Systems R&D

Modified:
  head/sys/x86/isa/atpic.c

Modified: head/sys/x86/isa/atpic.c
==============================================================================
--- head/sys/x86/isa/atpic.c	Thu Aug  7 16:53:07 2014	(r269674)
+++ head/sys/x86/isa/atpic.c	Thu Aug  7 17:00:50 2014	(r269675)
@@ -524,7 +524,7 @@ atpic_init(void *dummy __unused)
 		intr_register_source(&ai->at_intsrc);
 	}
 }
-SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL);
+SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_FOURTH, atpic_init, NULL);
 
 void
 atpic_handle_intr(u_int vector, struct trapframe *frame)