PERFORCE change 28535 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=28535

Change 28535 by peter at peter_daintree on 2003/04/08 11:37:23

	deal with "elf32 kernel" and "elf64 kernel" if necessary

Affected files ...

.. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#3 edit
.. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#4 edit
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#9 edit
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#3 (text+ko) ====

@@ -294,7 +294,9 @@
     addr = roundup(addr, PAGE_SIZE);
 
     kernend = 0;
-    kfp = file_findfile(NULL, "elf kernel");
+    kfp = file_findfile(NULL, "elf32 kernel");
+    if (kfp == NULL)
+	kfp = file_findfile(NULL, "elf kernel");
     if (kfp == NULL)
 	panic("can't find kernel file");
     file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);

==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ====

@@ -296,7 +296,9 @@
     addr = roundup(addr, PAGE_SIZE);
 
     kernend = 0;
-    kfp = file_findfile(NULL, "elf kernel");
+    kfp = file_findfile(NULL, "elf64 kernel");
+    if (kfp == NULL)
+	kfp = file_findfile(NULL, "elf kernel");
     if (kfp == NULL)
 	panic("can't find kernel file");
     file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);

==== //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#9 (text+ko) ====

@@ -267,7 +267,9 @@
 	 */
 	if (mdp != NULL) {
 		preload_metadata = mdp;
-		kmdp = preload_search_by_type("elf kernel");
+		kmdp = preload_search_by_type("elf32 kernel");
+		if (kmdp == NULL)
+			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 *);

==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#12 (text+ko) ====

@@ -234,7 +234,9 @@
 	 */
 	if (mdp != NULL) {
 		preload_metadata = mdp;
-		kmdp = preload_search_by_type("elf kernel");
+		kmdp = preload_search_by_type("elf64 kernel");
+		if (kmdp == NULL)
+			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 *);