Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kmod/patches/0001-kmod-module-lookup-search-module.builtin-file-too.patch

    Diff of /trunk/kmod/patches/0001-kmod-module-lookup-search-module.builtin-file-too.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1659 by niro, Mon Feb 20 13:50:36 2012 UTC revision 1660 by niro, Mon Feb 20 14:25:31 2012 UTC
    # Line 10  code of modprobe with builtin modules. Line 10  code of modprobe with builtin modules.
    10    
    11  Also fixes a small coding style issue in module_is_inkernel().  Also fixes a small coding style issue in module_is_inkernel().
    12  ---  ---
      TODO                      |    3 ---  
      libkmod/libkmod-module.c  |   24 ++++++++++++++++++++++--  
      libkmod/libkmod-private.h |    2 ++  
      libkmod/libkmod.c         |   21 ++++++++++++++++++++-  
      libkmod/libkmod.h         |    1 +  
      testsuite/test-modprobe.c |    1 -  
      6 files changed, 45 insertions(+), 7 deletions(-)  
    13    
     diff --git a/TODO b/TODO  
     index 315878e..4aa6f7a 100644  
     --- a/TODO  
     +++ b/TODO  
     @@ -49,9 +49,6 @@ Features:  
      * add quirk so we don't calculate dependencies for modules already loaded -  
        that shall fix the bug of vboxdrv and alsa above  
       
     -* search /lib/modules/$(uname -r)/modules.builtin.bin before returning error  
     -  that module was not found  
     -  
      Known Bugs:  
      ===========  
       
    14  diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c  diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
    15  index 835896f..4226bbb 100644  index 835896f..4226bbb 100644
    16  --- a/libkmod/libkmod-module.c  --- a/libkmod/libkmod-module.c
    # Line 177  index 6992e77..424640a 100644 Line 156  index 6992e77..424640a 100644
    156   /* Padding to make sure enum is not mapped to char */   /* Padding to make sure enum is not mapped to char */
    157   _KMOD_INDEX_PAD = (1 << 31),   _KMOD_INDEX_PAD = (1 << 31),
    158   };   };
     diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c  
     index 0022c06..3aebcae 100644  
     --- a/testsuite/test-modprobe.c  
     +++ b/testsuite/test-modprobe.c  
     @@ -83,7 +83,6 @@ static __noreturn int modprobe_builtin(const struct test *t)  
      }  
      static DEFINE_TEST(modprobe_builtin,  
      .description = "check if modprobe return 0 for builtin",  
     - .expected_fail = true,  
      .config = {  
      [TC_UNAME_R] = "4.4.4",  
      [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/builtin",  
     --  
     1.7.6.5  
    159    
    Legend:
    Removed from v.1659  
    changed lines
      Added in v.1660