[sysprof/ftrace: 8/16] Remove kernel module.



commit da7d147b49effd2f25beb4741bb5a6a0ec31ddc8
Author: Søren Sandmann Pedersen <sandmann daimi au dk>
Date:   Fri Aug 14 01:36:31 2009 -0400

    Remove kernel module.

 Makefile.am             |   20 +--
 configure.ac            |   38 ---
 module/Makefile         |   71 -----
 module/sysprof-module.c |  673 -----------------------------------------------
 module/sysprof-module.h |   33 ---
 sysprof.c               |    4 +-
 6 files changed, 3 insertions(+), 836 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a5a8180..552e02b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,3 @@
-SUBDIRS = $(MODULE_SUBDIR)
-DIST_SUBDIRS = module
-
 bin_PROGRAMS = sysprof-text
 
 if BUILD_GUI
@@ -30,9 +27,7 @@ SYSPROF_CORE =					\
 	unwind.h				\
 	unwind.c				\
 	watch.h					\
-	watch.c					\
-						\
-	module/sysprof-module.h			
+	watch.c
 
 #
 # GUI version
@@ -77,19 +72,6 @@ sysprof_text_CPPFLAGS =				\
 
 sysprof_text_LDADD = $(CORE_DEP_LIBS)
 
-#
-# Module stuff
-#  
-
-EXTRA_DIST =					\
-	module/sysprof-module.c			\
-	module/sysprof-module.h			\
-	module/Makefile
-
-insert-module:
-	/sbin/modprobe -r sysprof-module
-	/sbin/modprobe sysprof-module
-
 # 
 # Test programs
 #
diff --git a/configure.ac b/configure.ac
index 671abfe..190c0de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,43 +44,6 @@ AC_ARG_WITH(separate-debug-dir,
 AC_DEFINE_DIR(DEBUGDIR, debugdir,
               [Look for global separate debug info in this path])
 
-AC_ARG_ENABLE(kernel-module,
-     AC_HELP_STRING(--disable-kernel-module, disable building kernel module))
-
-kernel_module="no"
-if test "x$enableval" = "xno"; then
-	kernel_module="no"
-fi
-
-if test $kernel_module = "yes"; then
-  # Activate build in module/ subdir
-  MODULE_SUBDIR=module
-  
-  # Kernel version
-  KMAJOR=`uname -r | cut -d"." -f 1`
-  KMINOR=`uname -r | cut -d"." -f 2`
-  KMICRO=`uname -r | cut -d"." -f 3 | cut -d"-" -f 1`
-
-  if [[ $KMICRO -lt 9 ]] ; then
-     echo \*
-     echo \* Linux \>= 2.6.9 is required
-     echo \*
-     exit 1
-  fi
-
-  if [ ! test -f /lib/modules/`uname -r`/build/Makefile ] ; then
-     case `uname -r` in
-     *smp) pkg=kernel-smp-devel ;;
-     *) pkg=kernel-devel ;;
-     esac
-     echo \*
-     echo \* Sysprof requires the kernel source code to be installed.
-     echo \* On a Fedora Core system the relevant package is $pkg
-     echo \*
-     exit 1
-  fi
-fi
-
 # Pkgconfig dependencies
 
 core_dep="glib-2.0 >= 2.6.0"
@@ -97,7 +60,6 @@ AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
 
 AC_SUBST(CORE_DEP_LIBS)
 AC_SUBST(GUI_DEP_LIBS)
-AC_SUBST(MODULE_SUBDIR)
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/sysprof.c b/sysprof.c
index 9271d4d..4bb944d 100644
--- a/sysprof.c
+++ b/sysprof.c
@@ -659,8 +659,8 @@ enter_display_mode (Application *app)
     
     fill_main_list (app);
 
-    /* This has the side effect of selecting the first row, which in turn causes
-     * the other lists to be filled out
+    /* This has the side effect of selecting the first row, which in turn
+     * causes the other lists to be filled out
      */
     gtk_widget_grab_focus (GTK_WIDGET (app->object_view));
     



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]