diff options
author | peter <peter@FreeBSD.org> | 2003-05-01 03:33:28 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-05-01 03:33:28 +0000 |
commit | ff6e3400606463f189ccff37321c90fe35b572de (patch) | |
tree | fd0aed83c90134866c182acfcaa620c5caab6867 /sys/powerpc | |
parent | 6a018fff12bc83ff6175afcdf5ed208e5adff19c (diff) | |
download | FreeBSD-src-ff6e3400606463f189ccff37321c90fe35b572de.zip FreeBSD-src-ff6e3400606463f189ccff37321c90fe35b572de.tar.gz |
Back out last commits. The elf64/elf32 kernel name thing was more pain
than it was worth.
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/machdep.c | 4 | ||||
-rw-r--r-- | sys/powerpc/powerpc/machdep.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 4e91766..81fb604 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -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 *); diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 4e91766..81fb604 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -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 *); |