Back out last commits. The elf64/elf32 kernel name thing was more pain

than it was worth.
This commit is contained in:
Peter Wemm 2003-05-01 03:33:28 +00:00
parent 7f47668191
commit 161af19be7
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=114374
3 changed files with 3 additions and 9 deletions

View File

@ -267,9 +267,7 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
*/
if (mdp != NULL) {
preload_metadata = mdp;
kmdp = preload_search_by_type("elf32 kernel");
if (kmdp == NULL)
kmdp = preload_search_by_type("elf kernel");
kmdp = preload_search_by_type("elf kernel");
if (kmdp != NULL) {
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);

View File

@ -267,9 +267,7 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
*/
if (mdp != NULL) {
preload_metadata = mdp;
kmdp = preload_search_by_type("elf32 kernel");
if (kmdp == NULL)
kmdp = preload_search_by_type("elf kernel");
kmdp = preload_search_by_type("elf kernel");
if (kmdp != NULL) {
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);

View File

@ -242,9 +242,7 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
*/
if (mdp != NULL) {
preload_metadata = mdp;
kmdp = preload_search_by_type("elf64 kernel");
if (kmdp == NULL)
kmdp = preload_search_by_type("elf kernel");
kmdp = preload_search_by_type("elf kernel");
if (kmdp != NULL) {
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);