Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Dec 2009 20:43:15 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r200165 - in stable/8/sys: amd64/amd64 arm/arm compat/ia32 i386/i386 ia64/ia64 mips/mips powerpc/powerpc sparc64/sparc64
Message-ID:  <200912052043.nB5KhF39099700@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Sat Dec  5 20:43:15 2009
New Revision: 200165
URL: http://svn.freebsd.org/changeset/base/200165

Log:
  MFC r197729:
  
    Make sure that the primary native brandinfo always gets added
    first and the native ia32 compat as middle (before other things).
    o(ld)brandinfo as well as third party like linux, kfreebsd, etc.
    stays on SI_ORDER_ANY coming last.
  
    The reason for this is only to make sure that even in case we would
    overflow the MAX_BRANDS sized array, the native FreeBSD brandinfo
    would still be there and the system would be operational.
  
  Reviewed by:	kib

Modified:
  stable/8/sys/amd64/amd64/elf_machdep.c
  stable/8/sys/arm/arm/elf_machdep.c
  stable/8/sys/compat/ia32/ia32_sysvec.c
  stable/8/sys/i386/i386/elf_machdep.c
  stable/8/sys/ia64/ia64/elf_machdep.c
  stable/8/sys/mips/mips/elf64_machdep.c
  stable/8/sys/mips/mips/elf_machdep.c
  stable/8/sys/powerpc/powerpc/elf_machdep.c
  stable/8/sys/sparc64/sparc64/elf_machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/amd64/amd64/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -89,7 +89,7 @@ static Elf64_Brandinfo freebsd_brand_inf
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST,
 	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&freebsd_brand_info);
 

Modified: stable/8/sys/arm/arm/elf_machdep.c
==============================================================================
--- stable/8/sys/arm/arm/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/arm/arm/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -88,7 +88,7 @@ static Elf32_Brandinfo freebsd_brand_inf
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST,
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&freebsd_brand_info);
 

Modified: stable/8/sys/compat/ia32/ia32_sysvec.c
==============================================================================
--- stable/8/sys/compat/ia32/ia32_sysvec.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/compat/ia32/ia32_sysvec.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -152,7 +152,7 @@ static Elf32_Brandinfo ia32_brand_info =
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_MIDDLE,
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&ia32_brand_info);
 

Modified: stable/8/sys/i386/i386/elf_machdep.c
==============================================================================
--- stable/8/sys/i386/i386/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/i386/i386/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -88,7 +88,7 @@ static Elf32_Brandinfo freebsd_brand_inf
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST,
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&freebsd_brand_info);
 

Modified: stable/8/sys/ia64/ia64/elf_machdep.c
==============================================================================
--- stable/8/sys/ia64/ia64/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/ia64/ia64/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -95,7 +95,7 @@ static Elf64_Brandinfo freebsd_brand_inf
 	.brand_note	= &elf64_freebsd_brandnote,
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
-SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST,
     (sysinit_cfunc_t)elf64_insert_brand_entry, &freebsd_brand_info);
 
 static Elf64_Brandinfo freebsd_brand_oinfo = {

Modified: stable/8/sys/mips/mips/elf64_machdep.c
==============================================================================
--- stable/8/sys/mips/mips/elf64_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/mips/mips/elf64_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -108,7 +108,7 @@ static Elf64_Brandinfo freebsd_brand_inf
 	.flags		= BI_BRAND_NOTE
 };
 
-SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST,
     (sysinit_cfunc_t) elf64_insert_brand_entry,
     &freebsd_brand_info64);
 

Modified: stable/8/sys/mips/mips/elf_machdep.c
==============================================================================
--- stable/8/sys/mips/mips/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/mips/mips/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -90,7 +90,7 @@ static Elf32_Brandinfo freebsd_brand_inf
 	.flags		= BI_BRAND_NOTE
 };
 
-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST,
     (sysinit_cfunc_t) elf32_insert_brand_entry,
     &freebsd_brand_info);
 

Modified: stable/8/sys/powerpc/powerpc/elf_machdep.c
==============================================================================
--- stable/8/sys/powerpc/powerpc/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/powerpc/powerpc/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -91,7 +91,7 @@ static Elf32_Brandinfo freebsd_brand_inf
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST,
     (sysinit_cfunc_t) elf32_insert_brand_entry,
     &freebsd_brand_info);
 

Modified: stable/8/sys/sparc64/sparc64/elf_machdep.c
==============================================================================
--- stable/8/sys/sparc64/sparc64/elf_machdep.c	Sat Dec  5 20:40:28 2009	(r200164)
+++ stable/8/sys/sparc64/sparc64/elf_machdep.c	Sat Dec  5 20:43:15 2009	(r200165)
@@ -103,7 +103,7 @@ static Elf64_Brandinfo freebsd_brand_inf
 	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
-SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST,
     (sysinit_cfunc_t) elf64_insert_brand_entry,
     &freebsd_brand_info);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912052043.nB5KhF39099700>