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')

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 5f4fd35709b9b3e94873c6e38c574066c470a9e3 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Sat, 28 Nov 2009 01:33:51 +0300
Subject: Change KERNEL_RELOC_SYMBOL to "_stext" on ppc32

Currently staprun fails at send_relocation_kernel(), this is because
ppc32 doesn't have ".__start" symbol. I think we should use _stext,
just as other arches.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 runtime/staprun/staprun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/staprun')

diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c
index 078be4cf..5bd5163a 100644
--- a/runtime/staprun/staprun.c
+++ b/runtime/staprun/staprun.c
@@ -372,7 +372,7 @@ int send_relocation_kernel ()
               free (line); line=NULL;
               if (symbol == NULL) continue; /* OOM? */
 
-#ifdef __powerpc__
+#ifdef __powerpc64__
 #define KERNEL_RELOC_SYMBOL ".__start"
 #else
 #define KERNEL_RELOC_SYMBOL "_stext"
-- 
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/modverify.c     | 7 ++++---
 runtime/staprun/staprun_funcs.c | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'runtime/staprun')

diff --git a/runtime/staprun/modverify.c b/runtime/staprun/modverify.c
index 514f09f0..6f2687bb 100644
--- a/runtime/staprun/modverify.c
+++ b/runtime/staprun/modverify.c
@@ -28,13 +28,14 @@
 #include <cert.h>
 #include <certt.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+
 #include "nsscommon.h"
 #include "staprun.h"
 #include "modverify.h"
 
-#include <sys/stat.h>
-#include <errno.h>
-
 /* Function: int check_cert_db_permissions (const char *cert_db_path);
  * 
  * Check that the given certificate directory and its contents have
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/modverify.c     | 4 +++-
 runtime/staprun/staprun_funcs.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime/staprun')

diff --git a/runtime/staprun/modverify.c b/runtime/staprun/modverify.c
index 6f2687bb..4ed5eb74 100644
--- a/runtime/staprun/modverify.c
+++ b/runtime/staprun/modverify.c
@@ -19,6 +19,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "config.h"
+#include "staprun.h"
+
 #include <stdio.h>
 
 #include <nspr.h>
@@ -33,7 +36,6 @@
 #include <errno.h>
 
 #include "nsscommon.h"
-#include "staprun.h"
 #include "modverify.h"
 
 /* Function: int check_cert_db_permissions (const char *cert_db_path);
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