PERFORCE change 30240 for review

[Peter Wemm]

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

Change 30240 by peter at peter_daintree on 2003/04/30 19:45:16

	go back to calling it just an 'elf kernel' etc

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#7 edit
.. //depot/projects/hammer/sys/boot/common/load_elf.c#10 edit
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#12 edit
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#16 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#7 (text+ko) ====

@@ -1156,9 +1156,9 @@
 
 	preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE);
 	preload_bootstrap_relocate(KERNBASE);
-	kmdp = preload_search_by_type("elf64 kernel");
+	kmdp = preload_search_by_type("elf kernel");
 	if (kmdp == NULL)
-		kmdp = preload_search_by_type("elf kernel");
+		kmdp = preload_search_by_type("elf64 kernel");
 	boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
 	kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE;
 

==== //depot/projects/hammer/sys/boot/common/load_elf.c#10 (text+ko) ====

@@ -77,8 +77,8 @@
 static int __elfN(parse_modmetadata)(struct preloaded_file *mp, elf_file_t ef);
 static char	*fake_modname(const char *name);
 
-const char	*__elfN(kerneltype) = "elf" __XSTRING(__ELF_WORD_SIZE) " kernel";
-const char	*__elfN(moduletype) = "elf" __XSTRING(__ELF_WORD_SIZE) " module";
+const char	*__elfN(kerneltype) = "elf kernel";
+const char	*__elfN(moduletype) = "elf module";
 
 /*
  * Attempt to load the file (file) as an ELF module.  It will be stored at

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

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

@@ -242,9 +242,9 @@
 	 */
 	if (mdp != NULL) {
 		preload_metadata = mdp;
-		kmdp = preload_search_by_type("elf64 kernel");
+		kmdp = preload_search_by_type("elf kernel");
 		if (kmdp == NULL)
-			kmdp = preload_search_by_type("elf kernel");
+			kmdp = preload_search_by_type("elf32 kernel");
 		if (kmdp != NULL) {
 			boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
 			kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);