diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-06 08:28:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-06 12:44:25 +0100 |
| commit | 815a956f7bf4de031b7764f27f3eac005a15b5ce (patch) | |
| tree | 8bf426626daaa58f7d18ea3da58caedd713b6053 /meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch | |
| parent | 8618425e3f5a095a4fd409029c46e770c9526eee (diff) | |
| download | openembedded-core-contrib-815a956f7bf4de031b7764f27f3eac005a15b5ce.tar.gz | |
systemtap: Drop patches merged upstream
Several of our patches were merged upstream just beyond our current version.
Update to that version and drop them.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch')
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch deleted file mode 100644 index 28a7eae407..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix time_t print because in x32 ABI is long long int instead of long int. - -Upstream-Status: Pending - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -diff --git a/cache.cxx b/cache.cxx -index 3546b30..19c77ca 100644 ---- a/cache.cxx -+++ b/cache.cxx -@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s) - { - //interval not passed, don't continue - if (s.verbose > 1) -+#if defined(__x86_64__) && defined (__ILP32__) -+ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.", -+#else - clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.", -+#endif - (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; - return; - } -@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s) - { - //interval reached, continue - if (s.verbose > 1) -+#if defined(__x86_64__) && defined (__ILP32__) -+ clog << _F("Cleaning cache, interval reached %lld s > %lu s.", -+#else - clog << _F("Cleaning cache, interval reached %lu s > %lu s.", -+#endif - (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; - } - |