Rebase to latest upstream version (0.94.2)
Resolves: rhbz#1229924
This commit is contained in:
Boris Ranto
parent
9b5287b8d1
commit
b7119dde1d
|
|
@ -1,33 +0,0 @@
|
|||
From b2781fb5638afae7438b983a912ede126a8c5b85 Mon Sep 17 00:00:00 2001
|
||||
From: James Page <james.page@ubuntu.com>
|
||||
Date: Fri, 13 Mar 2015 19:46:04 +0000
|
||||
Subject: [PATCH] Add support for PPC architecture, provide fallback
|
||||
|
||||
Add high precision cpu cycles support for powerpc and powerpc64.
|
||||
|
||||
Provide a fallback for other architectures and warn during
|
||||
compilation.
|
||||
|
||||
Signed-off-by: James Page <james.page@ubuntu.com>
|
||||
|
||||
diff --git a/src/common/Cycles.h b/src/common/Cycles.h
|
||||
index 6e47cde..bb47d5c 100644
|
||||
--- a/src/common/Cycles.h
|
||||
+++ b/src/common/Cycles.h
|
||||
@@ -72,8 +72,15 @@ class Cycles {
|
||||
uint64_t cntvct;
|
||||
asm volatile ("isb; mrs %0, cntvct_el0; isb; " : "=r" (cntvct) :: "memory");
|
||||
return cntvct;
|
||||
+#elif defined(__powerpc__) || defined (__powerpc64__)
|
||||
+ // Based on:
|
||||
+ // https://github.com/randombit/botan/blob/net.randombit.botan/src/lib/entropy/hres_timer/hres_timer.cpp
|
||||
+ uint32_t lo = 0, hi = 0;
|
||||
+ asm volatile("mftbu %0; mftb %1" : "=r" (hi), "=r" (lo));
|
||||
+ return (((uint64_t)hi << 32) | lo);
|
||||
#else
|
||||
-#error No high-precision counter available for your OS/arch
|
||||
+#warning No high-precision counter available for your OS/arch
|
||||
+ return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
# common
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 0.94.1
|
||||
Release: 5%{?dist}
|
||||
Version: 0.94.2
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: User space components of the Ceph file system
|
||||
License: GPLv2
|
||||
|
|
@ -23,7 +23,6 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2
|
|||
Patch0: init-ceph.in-fedora.patch
|
||||
%endif
|
||||
Patch1: 0001-Disable-erasure_codelib-neon-build.patch
|
||||
Patch2: 0002-Add-support-for-PPC-arch.patch
|
||||
Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
|
||||
# fix build without tcmalloc
|
||||
# https://github.com/ceph/rocksdb/pull/5
|
||||
|
|
@ -431,7 +430,6 @@ python-cephfs instead.
|
|||
%patch0 -p1 -b .init
|
||||
%endif
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch10 -p1 -b .tcmalloc
|
||||
|
||||
|
|
@ -936,6 +934,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
|
|||
# actually build this meta package.
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2015 Boris Ranto <branto@redhat.com> - 1:0.94.2-1
|
||||
- Rebase to latest upstream version
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue