svn commit: r195707 - head/sys/kern

Robert Watson rwatson at FreeBSD.org
Wed Jul 15 09:19:02 UTC 2009


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);
 


More information about the svn-src-head mailing list