Change-Id: I3b2c62378704cfb06b7808dea6ce73dcea4dbd3c
Reviewed-on: http://photon-jenkins.eng.vmware.com/1206
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
| 1 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,35 +0,0 @@ |
| 1 |
-diff --git a/runtime/linux/runtime_defines.h b/runtime/linux/runtime_defines.h |
|
| 2 |
-index e69de29..6b44e0d 100644 |
|
| 3 |
-+++ b/runtime/linux/runtime_defines.h |
|
| 4 |
-@@ -0,0 +1,4 @@ |
|
| 5 |
-+#include <linux/gfp.h> |
|
| 6 |
-+#ifndef __GFP_WAIT |
|
| 7 |
-+#define __GFP_WAIT __GFP_RECLAIM |
|
| 8 |
-+#endif |
|
| 9 |
-diff --git a/runtime/stp_utrace.c b/runtime/stp_utrace.c |
|
| 10 |
-index c69dec1..a8afc0d 100644 |
|
| 11 |
-+++ b/runtime/stp_utrace.c |
|
| 12 |
-@@ -511,7 +511,8 @@ static struct utrace *__task_utrace_struct(struct task_struct *task) |
|
| 13 |
- */ |
|
| 14 |
- static bool utrace_task_alloc(struct task_struct *task) |
|
| 15 |
- {
|
|
| 16 |
-- struct utrace *utrace = kmem_cache_zalloc(utrace_cachep, GFP_IOFS); |
|
| 17 |
-+ struct utrace *utrace = kmem_cache_zalloc(utrace_cachep, |
|
| 18 |
-+ STP_ALLOC_FLAGS); |
|
| 19 |
- struct utrace *u; |
|
| 20 |
- |
|
| 21 |
- if (unlikely(!utrace)) |
|
| 22 |
-@@ -782,7 +783,7 @@ static struct utrace_engine *utrace_attach_task( |
|
| 23 |
- utrace = task_utrace_struct(target); |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
-- engine = kmem_cache_alloc(utrace_engine_cachep, GFP_IOFS); |
|
| 27 |
-+ engine = kmem_cache_alloc(utrace_engine_cachep, STP_ALLOC_FLAGS); |
|
| 28 |
- if (unlikely(!engine)) |
|
| 29 |
- return ERR_PTR(-ENOMEM); |
|
| 30 |
- |
|
| 31 |
-1.7.1 |
|
| 32 |
- |
| ... | ... |
@@ -7,16 +7,15 @@ |
| 7 | 7 |
%define with_sqlite 1 |
| 8 | 8 |
|
| 9 | 9 |
Name: systemtap |
| 10 |
-Version: 2.9 |
|
| 11 |
-Release: 5%{?dist}
|
|
| 10 |
+Version: 3.0 |
|
| 11 |
+Release: 1%{?dist}
|
|
| 12 | 12 |
Summary: Programmable system-wide instrumentation system |
| 13 | 13 |
Group: Development/System |
| 14 | 14 |
Vendor: VMware, Inc. |
| 15 | 15 |
Distribution: Photon |
| 16 | 16 |
URL: http://sourceware.org/systemtap/ |
| 17 | 17 |
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
|
| 18 |
-%define sha1 systemtap=37ecbc7445ff34db3c8204b1541f25524a0e8024 |
|
| 19 |
-Patch0: fix-kernel-4.4-build.patch |
|
| 18 |
+%define sha1 systemtap=5ef3a2d9945b0f6bae0061e33811e25e5138f5b7 |
|
| 20 | 19 |
License: GPLv2+ |
| 21 | 20 |
|
| 22 | 21 |
BuildRequires: elfutils-devel |
| ... | ... |
@@ -98,7 +97,6 @@ SystemTap server is the server component of an instrumentation system for system |
| 98 | 98 |
|
| 99 | 99 |
%prep |
| 100 | 100 |
%setup -q |
| 101 |
-%patch0 -p1 |
|
| 102 | 101 |
sed -i "s#"kernel"#"linux"#g" stap-prep |
| 103 | 102 |
sed -i "s#"devel"#"dev"#g" stap-prep |
| 104 | 103 |
|
| ... | ... |
@@ -331,6 +329,9 @@ fi |
| 331 | 331 |
%{_mandir}/man8/stap-server.8*
|
| 332 | 332 |
|
| 333 | 333 |
%changelog |
| 334 |
+* Fri Jul 22 2016 Divya Thaluru <dthaluru@vmware.com> 3.0-1 |
|
| 335 |
+- Updated version to 3.0 |
|
| 336 |
+- Removing patch to enable kernel (fix is present in upstream) |
|
| 334 | 337 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-5 |
| 335 | 338 |
- GA - Bump release of all rpms |
| 336 | 339 |
* Mon May 23 2016 Harish Udaiya KUmar <hudaiyakumar@vmware.com> 2.9-4 |