]> CyberLeo.Net >> Repos - FreeBSD/releng/7.2.git/commit
Merge r190708 from HEAD to releng/7.2:
authordchagin <dchagin@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 17 Apr 2009 17:05:31 +0000 (17:05 +0000)
committerdchagin <dchagin@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 17 Apr 2009 17:05:31 +0000 (17:05 +0000)
commit431cedc9d8d191e8c4c9c0ad2084849ac4b011bf
tree368d88cb6f9be656ab9aa1d0424ab8ca0f1a401d
parent784a620ee32e887ac9fba0f07c5dfa2cb850988f
Merge r190708 from HEAD to releng/7.2:
Fix KBI breakage by r190520 which affects older linux.ko binaries:

1) Move the new field (brand_note) to the end of the Brandinfo structure.
2) Add a new flag BI_BRAND_NOTE that indicates that the brand_note pointer
   is valid.
3) Use the brand_note field if the flag BI_BRAND_NOTE is set and as old
   modules won't have the flag set, so the new field brand_note would be
   ignored.

Suggested by:   jhb
Reviewed by:    jhb

Approved by: re (Ken Smith), kib (mentor)

git-svn-id: svn://svn.freebsd.org/base/releng/7.2@191213 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/amd64/amd64/elf_machdep.c
sys/amd64/linux32/linux32_sysvec.c
sys/arm/arm/elf_machdep.c
sys/compat/ia32/ia32_sysvec.c
sys/i386/i386/elf_machdep.c
sys/i386/linux/linux_sysvec.c
sys/ia64/ia64/elf_machdep.c
sys/kern/imgact_elf.c
sys/powerpc/powerpc/elf_machdep.c
sys/sparc64/sparc64/elf_machdep.c
sys/sys/imgact_elf.h