From owner-svn-src-head@FreeBSD.ORG  Wed Jul 15 09:19:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4639106566C;
	Wed, 15 Jul 2009 09:19:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D21158FC14;
	Wed, 15 Jul 2009 09:19:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6F9J1f4086595;
	Wed, 15 Jul 2009 09:19:01 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6F9J1fl086593;
	Wed, 15 Jul 2009 09:19:01 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200907150919.n6F9J1fl086593@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 15 Jul 2009 09:19:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195707 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 15 Jul 2009 09:19:02 -0000

Author: rwatson
Date: Wed Jul 15 09:19:01 2009
New Revision: 195707
URL: http://svn.freebsd.org/changeset/base/195707

Log:
  r195699 introduced an assertion regarding when progbits data in kernel
  modules was present, which turns out to be false in some situations.
  Back out the assertion.
  
  Reported by:	Luiz Otavio O Souza <lists.br at gmail.com>,
  		Florian Smeets <flo at kasimir.com>
  Approved by:	re (kensmith) (implicit)

Modified:
  head/sys/kern/link_elf_obj.c

Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c	Wed Jul 15 08:32:19 2009	(r195706)
+++ head/sys/kern/link_elf_obj.c	Wed Jul 15 09:19:01 2009	(r195707)
@@ -793,9 +793,6 @@ link_elf_load_file(linker_class_t cls, c
 					vnet_data_copy(ef->progtab[pb].addr,
 					    shdr[i].sh_size);
 #endif
-				else
-					panic("link_elf_load_file: unexpected "
-					    "progbits type");
 			} else
 				bzero(ef->progtab[pb].addr, shdr[i].sh_size);