| Message ID | 20160802212944.122603-1-brian.brooks@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Hi, I have problems applying these patches: ... anyone has tried? Can you grab them from the list and apply them, Brian? Christophe. git am ~/incoming/PATCH_1-6_linux-generic_internal_odp_cpu_pause_.mbox Applying: linux-generic: internal odp_cpu_pause() fatal: corrupt patch at line 33 Patch failed at 0001 linux-generic: internal odp_cpu_pause() The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". On 2 August 2016 at 23:29, Brian Brooks <brian.brooks@linaro.org> wrote: > Signed-off-by: Brian Brooks <brian.brooks@linaro.org> > --- > platform/linux-generic/arch/default/odp/api/cpu_arch.h | 2 +- > platform/linux-generic/arch/mips64/odp/api/cpu_arch.h | 2 +- > platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h | 2 +- > platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 2 +- > platform/linux-generic/include/odp/api/cpu.h | 5 +++++ > 5 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/odp/api/cpu_arch.h > index 22b1da2..0d52616 100644 > --- a/platform/linux-generic/arch/default/odp/api/cpu_arch.h > +++ b/platform/linux-generic/arch/default/odp/api/cpu_arch.h > @@ -13,7 +13,7 @@ extern "C" { > > #define _ODP_CACHE_LINE_SIZE 64 > > -static inline void odp_cpu_pause(void) > +static inline void _odp_cpu_pause(void) > { > } > > diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h > index 3582b12..8235908 100644 > --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h > +++ b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h > @@ -17,7 +17,7 @@ extern "C" { > #error Please add support for your arch in cpu_arch.h > #endif > > -static inline void odp_cpu_pause(void) > +static inline void _odp_cpu_pause(void) > { > __asm__ __volatile__ ("nop"); > __asm__ __volatile__ ("nop"); > diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h > index 22b1da2..0d52616 100644 > --- a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h > +++ b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h > @@ -13,7 +13,7 @@ extern "C" { > > #define _ODP_CACHE_LINE_SIZE 64 > > -static inline void odp_cpu_pause(void) > +static inline void _odp_cpu_pause(void) > { > } > > diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h > index 44e6b30..4f4dbff 100644 > --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h > +++ b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h > @@ -13,7 +13,7 @@ extern "C" { > > #define _ODP_CACHE_LINE_SIZE 64 > > -static inline void odp_cpu_pause(void) > +static inline void _odp_cpu_pause(void) > { > #ifdef __SSE2__ > __asm__ __volatile__ ("pause"); > diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h > index d49c782..ae04769 100644 > --- a/platform/linux-generic/include/odp/api/cpu.h > +++ b/platform/linux-generic/include/odp/api/cpu.h > @@ -19,6 +19,11 @@ extern "C" { > > #include <odp/api/cpu_arch.h> > > +static inline void odp_cpu_pause(void) > +{ > + _odp_cpu_pause(); > +} > + > #include <odp/api/spec/cpu.h> > > #ifdef __cplusplus > -- > 2.9.2
On 08/04 13:39:43, Christophe Milard wrote: > Hi, > I have problems applying these patches: > ... anyone has tried? > Can you grab them from the list and apply them, Brian? I see the same issue.. Will investigate and respin. Thanks for pointing it out.
diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/odp/api/cpu_arch.h index 22b1da2..0d52616 100644 --- a/platform/linux-generic/arch/default/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/default/odp/api/cpu_arch.h @@ -13,7 +13,7 @@ extern "C" { #define _ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) +static inline void _odp_cpu_pause(void) { } diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h index 3582b12..8235908 100644 --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h @@ -17,7 +17,7 @@ extern "C" { #error Please add support for your arch in cpu_arch.h #endif -static inline void odp_cpu_pause(void) +static inline void _odp_cpu_pause(void) { __asm__ __volatile__ ("nop"); __asm__ __volatile__ ("nop"); diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h index 22b1da2..0d52616 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h @@ -13,7 +13,7 @@ extern "C" { #define _ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) +static inline void _odp_cpu_pause(void) { } diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h index 44e6b30..4f4dbff 100644 --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h @@ -13,7 +13,7 @@ extern "C" { #define _ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) +static inline void _odp_cpu_pause(void) { #ifdef __SSE2__ __asm__ __volatile__ ("pause"); diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index d49c782..ae04769 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -19,6 +19,11 @@ extern "C" { #include <odp/api/cpu_arch.h> +static inline void odp_cpu_pause(void) +{ + _odp_cpu_pause(); +} + #include <odp/api/spec/cpu.h> #ifdef __cplusplus
Signed-off-by: Brian Brooks <brian.brooks@linaro.org> --- platform/linux-generic/arch/default/odp/api/cpu_arch.h | 2 +- platform/linux-generic/arch/mips64/odp/api/cpu_arch.h | 2 +- platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h | 2 +- platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 2 +- platform/linux-generic/include/odp/api/cpu.h | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) -- 2.9.2