diff -Nru systemtap-1.4/debian/changelog systemtap-1.4/debian/changelog
--- systemtap-1.4/debian/changelog	2011-06-18 00:09:15.000000000 +0000
+++ systemtap-1.4/debian/changelog	2011-08-31 20:22:09.000000000 +0000
@@ -1,3 +1,12 @@
+systemtap (1.4-1ubuntu2) oneiric; urgency=low
+
+  * debian/patches/fix-compile-warning: Apply upstream fix for failure to
+    compile tapsets due to kernel change.  (LP: #838205)
+  * debian/patches/no-werror.patch: Remove -Werror from CFLAGS to avoid
+    new variable-set-but-not-used errors when building.
+
+ -- Ubuntu <ubuntu@domU-12-31-39-14-F0-B3.compute-1.internal>  Wed, 31 Aug 2011 16:06:54 +0000
+
 systemtap (1.4-1ubuntu1) oneiric; urgency=low
 
   * Merge from Debian unstable, remaining changes:
diff -Nru systemtap-1.4/debian/patches/fix-compile-warning systemtap-1.4/debian/patches/fix-compile-warning
--- systemtap-1.4/debian/patches/fix-compile-warning	1970-01-01 00:00:00.000000000 +0000
+++ systemtap-1.4/debian/patches/fix-compile-warning	2011-08-31 16:06:13.000000000 +0000
@@ -0,0 +1,72 @@
+commit 0bbb80098decc9c4c43a1800538007d86b600bba
+Author: Josh Stone <jistone@redhat.com>
+Date:   Tue Jun 7 11:23:13 2011 -0700
+
+    stapconf: Conditionalize stacktrace_ops.warning{,_symbol}
+    
+    Kernel commit 449a66f removed these fields.
+    
+    * buildrun.cxx: Include the new test.
+    * runtime/autoconf-stacktrace_ops-warning.c: Check the warning field.
+    * runtime/stack.c: Conditionalize the warning initialization.
+
+diff --git a/buildrun.cxx b/buildrun.cxx
+index 0bebc35..79f8818 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -215,6 +215,8 @@ compile_pass (systemtap_session& s)
+   output_autoconf(s, o, "autoconf-ring_buffer-flags.c", "STAPCONF_RING_BUFFER_FLAGS", NULL);
+   output_autoconf(s, o, "autoconf-kallsyms-on-each-symbol.c", "STAPCONF_KALLSYMS_ON_EACH_SYMBOL", NULL);
+   output_autoconf(s, o, "autoconf-walk-stack.c", "STAPCONF_WALK_STACK", NULL);
++  output_autoconf(s, o, "autoconf-stacktrace_ops-warning.c",
++                  "STAPCONF_STACKTRACE_OPS_WARNING", NULL);
+   output_autoconf(s, o, "autoconf-mm-context-vdso.c", "STAPCONF_MM_CONTEXT_VDSO", NULL);
+   output_autoconf(s, o, "autoconf-blk-types.c", "STAPCONF_BLK_TYPES", NULL);
+   output_autoconf(s, o, "autoconf-perf-structpid.c", "STAPCONF_PERF_STRUCTPID", NULL);
+diff --git a/runtime/autoconf-stacktrace_ops-warning.c b/runtime/autoconf-stacktrace_ops-warning.c
+new file mode 100644
+index 0000000..9c00f05
+--- /dev/null
++++ b/runtime/autoconf-stacktrace_ops-warning.c
+@@ -0,0 +1,10 @@
++/* Some kernels have warning fields in stacktrace_ops. */
++#include <linux/sched.h>
++#include <asm/stacktrace.h>
++
++void foo (void)
++{
++  struct stacktrace_ops t;
++  t.warning = 0;
++  (void) t;
++}
+diff --git a/runtime/stack.c b/runtime/stack.c
+index 68a7e4f..b2d5d1d 100644
+--- a/runtime/stack.c
++++ b/runtime/stack.c
+@@ -73,6 +73,7 @@ struct print_stack_data
+         int level;
+ };
+ 
++#if defined(STAPCONF_STACKTRACE_OPS_WARNING)
+ static void print_stack_warning(void *data, char *msg)
+ {
+ }
+@@ -81,6 +82,7 @@ static void
+ print_stack_warning_symbol(void *data, char *msg, unsigned long symbol)
+ {
+ }
++#endif
+ 
+ static int print_stack_stack(void *data, char *name)
+ {
+@@ -95,8 +97,10 @@ static void print_stack_address(void *data, unsigned long addr, int reliable)
+ }
+ 
+ static const struct stacktrace_ops print_stack_ops = {
++#if defined(STAPCONF_STACKTRACE_OPS_WARNING)
+ 	.warning = print_stack_warning,
+ 	.warning_symbol = print_stack_warning_symbol,
++#endif
+ 	.stack = print_stack_stack,
+ 	.address = print_stack_address,
+ #if defined(STAPCONF_WALK_STACK)
diff -Nru systemtap-1.4/debian/patches/no-werror.patch systemtap-1.4/debian/patches/no-werror.patch
--- systemtap-1.4/debian/patches/no-werror.patch	1970-01-01 00:00:00.000000000 +0000
+++ systemtap-1.4/debian/patches/no-werror.patch	2011-08-31 20:21:07.000000000 +0000
@@ -0,0 +1,154 @@
+Description: remove -Werror from CFLAGS to avoid build failures
+ due to some variables being set but not used.
+Author: Serge Hallyn <serge.hallyn@canonical.com>
+Forwarded: no
+
+Index: systemtap-1.4/Makefile.am
+===================================================================
+--- systemtap-1.4.orig/Makefile.am	2011-08-31 18:30:12.748558006 +0000
++++ systemtap-1.4/Makefile.am	2011-08-31 18:30:27.348558017 +0000
+@@ -13,8 +13,8 @@
+ 	      -DPKGLIBDIR='"$(pkglibexecdir)"' \
+ 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
+ 
+-AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
+-AM_CXXFLAGS = -Wall -Werror
++AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wunused -Wformat=2 -W
++AM_CXXFLAGS = -Wall
+ 
+ man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap \
+ dtrace.1 stap-merge.1\
+@@ -170,16 +170,16 @@
+ if BUILD_TRANSLATOR
+ if HAVE_NSS
+ stap_sign_module_SOURCES = modsign.cxx nsscommon.c
+-stap_sign_module_CPPFLAGS = -Wall -Werror $(AM_CPPFLAGS) $(nss_CFLAGS) $(nspr_CFLAGS)
++stap_sign_module_CPPFLAGS = -Wall $(AM_CPPFLAGS) $(nss_CFLAGS) $(nspr_CFLAGS)
+ stap_sign_module_LDADD = -lnss3 -lnspr4
+ 
+ if BUILD_SERVER
+ stap_client_connect_SOURCES = stap-client-connect.c nsscommon.c
+-stap_client_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
++stap_client_connect_CFLAGS = -Wall $(nss_CFLAGS) $(nspr_CFLAGS)
+ stap_client_connect_LDADD = -lssl3 -lnss3 -lnspr4 -lplc4
+ 
+ stap_server_connect_SOURCES = stap-server-connect.c nsscommon.c
+-stap_server_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
++stap_server_connect_CFLAGS = -Wall $(nss_CFLAGS) $(nspr_CFLAGS)
+ stap_server_connect_LDADD = -lssl3 -lnss3 -lnspr4 -lplc4
+ endif
+ endif
+Index: systemtap-1.4/Makefile.in
+===================================================================
+--- systemtap-1.4.orig/Makefile.in	2011-08-31 18:30:29.498558012 +0000
++++ systemtap-1.4/Makefile.in	2011-08-31 18:30:39.358558879 +0000
+@@ -376,8 +376,8 @@
+ 	      -DPKGLIBDIR='"$(pkglibexecdir)"' \
+ 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
+ 
+-AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
+-AM_CXXFLAGS = -Wall -Werror
++AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wunused -Wformat=2 -W
++AM_CXXFLAGS = -Wall
+ man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
+ 	stapex.3stap dtrace.1 stap-merge.1 stappaths.7 $(am__append_2) \
+ 	$(am__append_4) $(am__append_8)
+@@ -429,13 +429,13 @@
+ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_LDFLAGS = $(AM_LDFLAGS)
+ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_LDFLAGS = $(AM_LDFLAGS)
+ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_SOURCES = modsign.cxx nsscommon.c
+-@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_CPPFLAGS = -Wall -Werror $(AM_CPPFLAGS) $(nss_CFLAGS) $(nspr_CFLAGS)
++@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_CPPFLAGS = -Wall $(AM_CPPFLAGS) $(nss_CFLAGS) $(nspr_CFLAGS)
+ @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_sign_module_LDADD = -lnss3 -lnspr4
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_client_connect_SOURCES = stap-client-connect.c nsscommon.c
+-@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_client_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
++@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_client_connect_CFLAGS = -Wall $(nss_CFLAGS) $(nspr_CFLAGS)
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_client_connect_LDADD = -lssl3 -lnss3 -lnspr4 -lplc4
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_SOURCES = stap-server-connect.c nsscommon.c
+-@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
++@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_CFLAGS = -Wall $(nss_CFLAGS) $(nspr_CFLAGS)
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_LDADD = -lssl3 -lnss3 -lnspr4 -lplc4
+ @BUILD_TRANSLATOR_TRUE@loc2c_test_SOURCES = loc2c-test.c loc2c.c
+ @BUILD_TRANSLATOR_TRUE@loc2c_test_CFLAGS = $(stap_CFLAGS)
+Index: systemtap-1.4/configure
+===================================================================
+--- systemtap-1.4.orig/configure	2011-08-31 18:33:59.808562739 +0000
++++ systemtap-1.4/configure	2011-08-31 18:34:14.118563137 +0000
+@@ -5682,8 +5682,8 @@
+ 
+    save_CFLAGS="$CFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
+-   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+-   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int something ();
+Index: systemtap-1.4/configure.ac
+===================================================================
+--- systemtap-1.4.orig/configure.ac	2011-08-31 18:33:59.838559680 +0000
++++ systemtap-1.4/configure.ac	2011-08-31 18:34:19.168562111 +0000
+@@ -63,8 +63,8 @@
+ AS_IF([test "x$enable_ssp" != xno],[
+    save_CFLAGS="$CFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
+-   CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
+-   CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
++   CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+    AC_COMPILE_IFELSE([int something ();], [
+        AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])
+ 	CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
+Index: systemtap-1.4/grapher/Makefile.am
+===================================================================
+--- systemtap-1.4.orig/grapher/Makefile.am	2011-08-31 18:37:54.908557975 +0000
++++ systemtap-1.4/grapher/Makefile.am	2011-08-31 18:38:03.438558089 +0000
+@@ -6,7 +6,7 @@
+ # "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use
+ # the libglade ones.
+ stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"'
+-stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror
++stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall
+ stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx GraphStyle.cxx
+ stapgraph_LDADD = $(libglade_LIBS)
+ stapgraph_LDFLAGS = -Wl,--as-needed
+Index: systemtap-1.4/grapher/Makefile.in
+===================================================================
+--- systemtap-1.4.orig/grapher/Makefile.in	2011-08-31 18:37:53.418558238 +0000
++++ systemtap-1.4/grapher/Makefile.in	2011-08-31 18:38:07.718556185 +0000
+@@ -243,7 +243,7 @@
+ # "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use
+ # the libglade ones.
+ @BUILD_GRAPHER_TRUE@stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"'
+-@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror
++@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall
+ @BUILD_GRAPHER_TRUE@stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx GraphStyle.cxx
+ @BUILD_GRAPHER_TRUE@stapgraph_LDADD = $(libglade_LIBS)
+ @BUILD_GRAPHER_TRUE@dist_pkgdata_DATA = graph-dialog.glade stap-start.glade processwindow.glade
+Index: systemtap-1.4/runtime/staprun/Makefile.am
+===================================================================
+--- systemtap-1.4.orig/runtime/staprun/Makefile.am	2011-08-31 18:42:46.738558002 +0000
++++ systemtap-1.4/runtime/staprun/Makefile.am	2011-08-31 18:42:52.458557961 +0000
+@@ -1,7 +1,7 @@
+ # Makefile.am --- automake input file for systemtap runtime tools
+ 
+ AM_CPPFLAGS = -D_GNU_SOURCE
+-AM_CFLAGS = -Wall -Werror -Wunused -W -Wformat=2 -Wno-format-nonliteral
++AM_CFLAGS = -Wall -Wunused -W -Wformat=2 -Wno-format-nonliteral
+ AM_CPPFLAGS += -I$(srcdir)/../../includes
+ AM_CPPFLAGS += -I$(builddir)/../../includes/sys
+ AM_CPPFLAGS += -DBINDIR='"$(bindir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"${pkgdatadir}"' -DPKGLIBDIR='"$(pkglibexecdir)"'
+Index: systemtap-1.4/runtime/staprun/Makefile.in
+===================================================================
+--- systemtap-1.4.orig/runtime/staprun/Makefile.in	2011-08-31 18:42:44.758557237 +0000
++++ systemtap-1.4/runtime/staprun/Makefile.in	2011-08-31 18:42:57.068558017 +0000
+@@ -224,7 +224,7 @@
+ 	-I$(builddir)/../../includes/sys -DBINDIR='"$(bindir)"' \
+ 	-DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"${pkgdatadir}"' \
+ 	-DPKGLIBDIR='"$(pkglibexecdir)"'
+-AM_CFLAGS = -Wall -Werror -Wunused -W -Wformat=2 \
++AM_CFLAGS = -Wall -Wunused -W -Wformat=2 \
+ 	-Wno-format-nonliteral @PIECFLAGS@
+ AM_LDFLAGS = @PIELDFLAGS@
+ staprun_SOURCES = staprun.c staprun_funcs.c ctl.c common.c \
diff -Nru systemtap-1.4/debian/patches/series systemtap-1.4/debian/patches/series
--- systemtap-1.4/debian/patches/series	2011-06-18 00:00:01.000000000 +0000
+++ systemtap-1.4/debian/patches/series	2011-08-31 20:13:09.000000000 +0000
@@ -6,3 +6,5 @@
 debversion.diff
 adding-ifdef-CLONE_STOPPED-to-stop-module-compilatio.patch
 Updated-__ip_sock_daddr-for-2.6.38-kernels.patch
+fix-compile-warning
+no-werror.patch