352.09352.09

5 files changed, 23 insertions, 40 deletions

diff --git a/install-from-cwd.c b/install-from-cwd.c
index 64fc6d4..3833bb5 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -51,7 +51,7 @@
 
 
 static Package *parse_manifest(Options *op);
-static int install_kernel_module(Options *op,  Package *p);
+static int install_kernel_modules(Options *op,  Package *p);
 static void free_package(Package *p);
 static int assisted_module_signing(Options *op, Package *p);
 
@@ -171,10 +171,10 @@ int install_from_cwd(Options *op)
 
     should_install_uvm(op, p);
 
-    /* attempt to build a kernel module for the target kernel */
+    /* attempt to build the kernel modules for the target kernel */
 
     if (!op->no_kernel_module) {
-        if (!install_kernel_module(op, p)) {
+        if (!install_kernel_modules(op, p)) {
             goto failed;
         }
     } else {
@@ -413,17 +413,17 @@ int install_from_cwd(Options *op)
 
 
 /*
- * install_kernel_module() - attempt to build and install a kernel
- * module for the running kernel; we first check if a prebuilt kernel
- * interface file exists. If yes, we try to link it into the final
- * kernel module, else we try to build one from source.
+ * Attempt to build and install the appropriate kernel modules for the
+ * running kernel; we first check if prebuilt kernel interfaces exist.
+ * If yes, we try to link those into the final kernel module, else we
+ * try to build from source.
  *
- * If we succeed in building a kernel module, we attempt to load it
- * into the host kernel and add it to the list of files to install if
- * the load attempt succeeds.
+ * If we succeed in building the kernel modules, we attempt to load
+ * them into the host kernel and add them to the list of files to
+ * install if the load attempt succeeds.
  */
 
-static int install_kernel_module(Options *op,  Package *p)
+static int install_kernel_modules(Options *op,  Package *p)
 {
     PrecompiledInfo *precompiled_info;
 
@@ -572,7 +572,7 @@ precompiled_done:
     
         /* and now, build the kernel interface */
         
-        if (!build_kernel_module(op, p)) return FALSE;
+        if (!build_kernel_modules(op, p)) return FALSE;
     }
 
     /* Optionally sign the kernel module */
@@ -583,7 +583,7 @@ precompiled_done:
      * to be sure it's OK
      */
     
-    if (!test_kernel_module(op, p)) return FALSE;
+    if (!test_kernel_modules(op, p)) return FALSE;
     
     /* add the kernel modules to the list of things to install */
     
diff --git a/kernel.c b/kernel.c
index 1f576ea..e787278 100644
--- a/kernel.c
+++ b/kernel.c
@@ -635,12 +635,12 @@ static int check_file(Options *op, const char *dir, const char *filename,
 
 
 /*
- * build_kernel_module() - determine the kernel include directory,
+ * Determine the kernel include directory,
  * copy the kernel module source files into a temporary directory, and
  * compile nvidia.o.
  */
 
-int build_kernel_module(Options *op, Package *p)
+int build_kernel_modules(Options *op, Package *p)
 {
     char *result, *cmd;
     int ret;
@@ -651,19 +651,6 @@ int build_kernel_module(Options *op, Package *p)
      */
     
     touch_directory(op, p->kernel_module_build_directory);
-    
-    /*
-     * Check if conftest.sh can determine the Makefile, there's
-     * no hope for the make rules if this fails.
-     */
-    ret = run_conftest(op, p, "select_makefile just_msg", &result);
-
-    if (!ret) {
-        if (result)
-            ui_error(op, "%s", result); /* display conftest.sh's error message */
-        nvfree(result);
-        return FALSE;
-    }
 
     if (!fbdev_check(op, p)) return FALSE;
     if (!xen_check(op, p)) return FALSE;
@@ -725,8 +712,7 @@ int build_kernel_module(Options *op, Package *p)
     ui_log(op, "Kernel module compilation complete.");
 
     return TRUE;
-    
-} /* build_kernel_module() */
+}
 
 
 
@@ -1453,11 +1439,11 @@ static int ignore_load_error(Options *op, Package *p,
 
 
 /*
- * test_kernel_module() - attempt to insmod the kernel modules and then rmmod
- * nvidia-uvm.  Return TRUE if the insmod succeeded, or FALSE otherwise.
+ * Attempt to insmod the kernel modules and then rmmod nvidia-uvm.
+ * Return TRUE if the insmod succeeded, or FALSE otherwise.
  */
 
-int test_kernel_module(Options *op, Package *p)
+int test_kernel_modules(Options *op, Package *p)
 {
     char *cmd = NULL, *data = NULL, *module_path;
     int old_loglevel = 0, new_loglevel = 0;
@@ -1620,8 +1606,7 @@ test_exit:
     }
 
     return ret;
-    
-} /* test_kernel_module() */
+}
 
 
 
diff --git a/kernel.h b/kernel.h
index 9bbc37c..34c534f 100644
--- a/kernel.h
+++ b/kernel.h
@@ -36,10 +36,10 @@ int link_kernel_module                             (Options*, Package*,
                                                     const char *,
                                                     const PrecompiledFileInfo *);
 int check_cc_version                               (Options*, Package*);
-int build_kernel_module                            (Options*, Package*);
+int build_kernel_modules                           (Options*, Package*);
 int build_kernel_interface                         (Options*, Package*,
                                                     PrecompiledFileInfo **);
-int test_kernel_module                             (Options*, Package*);
+int test_kernel_modules                            (Options*, Package*);
 int load_kernel_module                             (Options*, Package*);
 int check_for_unloaded_kernel_module               (Options*, Package*);
 PrecompiledInfo *find_precompiled_kernel_interface (Options*, Package*);
diff --git a/nvidia-installer.c b/nvidia-installer.c
index f243654..94300f1 100644
--- a/nvidia-installer.c
+++ b/nvidia-installer.c
@@ -69,8 +69,6 @@ static void print_version(void)
                 "The NVIDIA Accelerated Graphics Driver Set for %s-%s.",
                 INSTALLER_OS, INSTALLER_ARCH);
     nv_info_msg(NULL, "");
-    nv_info_msg(TAB, "Copyright (C) 2003 - 2010 NVIDIA Corporation.");
-    nv_info_msg(NULL, "");
 }
 
 
diff --git a/version.mk b/version.mk
index 7064f31..61aeb50 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 349.16
+NVIDIA_VERSION = 352.09