PERFORCE change 30262 for review

[Peter Wemm]

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

Change 30262 by peter at peter_daintree on 2003/04/30 21:12:04

	revert to vendor

Affected files ...

.. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#6 edit
.. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#7 edit

Differences ...

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

@@ -302,10 +302,6 @@
     file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
     file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
     file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);
-    /* Compatability with older kernels */
-    file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto);
-    file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp);
-    file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend);
 
     *modulep = addr;
     size = md_copymodules(0);
@@ -313,8 +309,6 @@
 
     md = file_findmetadata(kfp, MODINFOMD_KERNEND);
     bcopy(&kernend, md->md_data, sizeof kernend);
-    md = file_findmetadata(kfp, MODINFOMD_OKERNEND);	/* Compat */
-    bcopy(&kernend, md->md_data, sizeof kernend);
 
     (void)md_copymodules(addr);
 

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

@@ -304,10 +304,6 @@
     file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
     file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
     file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);
-    /* The next three are for compatability with older kernels */
-    file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto);
-    file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp);
-    file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend);
     file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slot, &dtlb_slot);
     file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slot, &itlb_slot);
     file_addmetadata(kfp, MODINFOMD_DTLB,
@@ -321,8 +317,6 @@
 
     md = file_findmetadata(kfp, MODINFOMD_KERNEND);
     bcopy(&kernend, md->md_data, sizeof kernend);
-    md = file_findmetadata(kfp, MODINFOMD_OKERNEND);	/* Compat */
-    bcopy(&kernend, md->md_data, sizeof kernend);
 
     (void)md_copymodules(addr);