Remove grub_dl_unload_all. It's unnecessary and causes trouble

diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 09849f17416e6215766bdbc509db95829a5f5b77..02d785b9b94d196c4c183ae419b61e8eefb87040 100644 (file)
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -682,20 +682,3 @@ grub_dl_unload_unneeded (void)
       p = p->next;
     }
 }
-
-/* Unload all modules.  */
-void
-grub_dl_unload_all (void)
-{
-  while (grub_dl_head)
-    {
-      grub_dl_t p;
-
-      grub_dl_unload_unneeded ();
-
-      /* Force to decrement the ref count. This will purge pre-loaded
-        modules and manually inserted modules.  */
-      for (p = grub_dl_head; p; p = p->next)
-       p->ref_count--;
-    }
-}

diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index a73e27ad617cbb80f62902269ea1ae24ba35d2c1..7ae9017129c31041598371cb9219bdbfc30f4a13 100644 (file)
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -546,8 +546,6 @@ FUNCTION(grub_chainloader_real_boot)
        pushl   %edx
        pushl   %eax
 
-       call    EXT_C(grub_dl_unload_all)
-
        /* Turn off Gate A20 */
        xorl    %eax, %eax
        call    EXT_C(grub_gate_a20)

diff --git a/include/grub/dl.h b/include/grub/dl.h
index 9db6104672ae897b4ff735aee86b390a50928854..afc4af41aace8077e81a577b3b3f707553b36c3a 100644 (file)
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -101,7 +101,6 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name);
 grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
-void grub_dl_unload_all (void);
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 extern grub_dl_t EXPORT_VAR(grub_dl_head);