From 1302a542db385c63ec1702dff9495870edf5b095 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 30 Nov 2009 11:04:44 +0800
Subject: Fix build error when !HAVE_NSS

* runtime/staprun/staprun_funcs.c (assert_stap_module_permissions): Mark
  parameters unused.
---
 runtime/staprun/staprun_funcs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime/staprun/staprun_funcs.c')

diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c
index 8f3d84ad..26e8c663 100644
--- a/runtime/staprun/staprun_funcs.c
+++ b/runtime/staprun/staprun_funcs.c
@@ -507,8 +507,8 @@ check_groups (
 void assert_stap_module_permissions(
   const char *module_path,
   int module_fd,
-  const void *module_data,
-  off_t module_size
+  const void *module_data __attribute__ ((unused)),
+  off_t module_size __attribute__ ((unused))
 ) {
 	int check_groups_rc;
 	int check_signature_rc;
-- 
cgit 


From 8c859ce37271f35d0b93cd40f121af7b04621238 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Tue, 1 Dec 2009 15:10:06 -0500
Subject: Make sure system types are defined.

---
 runtime/staprun/staprun_funcs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime/staprun/staprun_funcs.c')

diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c
index 26e8c663..9d623c02 100644
--- a/runtime/staprun/staprun_funcs.c
+++ b/runtime/staprun/staprun_funcs.c
@@ -11,8 +11,6 @@
  */
 
 #include "config.h"
-#include "staprun.h"
-#include "modverify.h"
 
 #include <sys/mount.h>
 #include <sys/utsname.h>
@@ -20,6 +18,9 @@
 #include <pwd.h>
 #include <assert.h>
 
+#include "staprun.h"
+#include "modverify.h"
+
 typedef int (*check_module_path_func)(const char *module_path, int module_fd);
 
 extern long init_module(void *, unsigned long, const char *);
-- 
cgit 


From 8d9d8fe1e78b91140f41bdd71351dbea007d70ec Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Tue, 1 Dec 2009 16:43:53 -0500
Subject: Regenerate autotools files using autoreconf to pick up latest
 Makefile.am changes.

---
 runtime/staprun/staprun_funcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/staprun/staprun_funcs.c')

diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c
index 9d623c02..db58cd4f 100644
--- a/runtime/staprun/staprun_funcs.c
+++ b/runtime/staprun/staprun_funcs.c
@@ -11,6 +11,7 @@
  */
 
 #include "config.h"
+#include "staprun.h"
 
 #include <sys/mount.h>
 #include <sys/utsname.h>
@@ -18,7 +19,6 @@
 #include <pwd.h>
 #include <assert.h>
 
-#include "staprun.h"
 #include "modverify.h"
 
 typedef int (*check_module_path_func)(const char *module_path, int module_fd);
-- 
cgit