On Thu, 2010-05-06 at 10:08 +0200, Wolfgang Mauerer wrote:
> From: Wolfgang Mauerer (none) <wolfg...@dirichlet>
> 
> The per_cpu__ prefix for per-cpu-variables in the Linux kernel
> is gone since dd17c8f72993f. This patch adapts the x86_64
> task switching code to cope with kernels before and after this
> commit.
> 
> Signed-off-by: Wolfgang Mauerer <wolfgang.maue...@siemens.com>
> Acked-by: Jan Kiszka <jan.kis...@siemens.com>
> ---
>  include/asm-x86/switch_64.h |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/include/asm-x86/switch_64.h b/include/asm-x86/switch_64.h
> index a716ad6..c2df7d8 100644
> --- a/include/asm-x86/switch_64.h
> +++ b/include/asm-x86/switch_64.h
> @@ -37,6 +37,10 @@ struct xnarch_x8664_initstack {
>  };
>  
>  #ifdef CONFIG_CC_STACKPROTECTOR
> +#include <asm/percpu.h>
> +#ifndef per_cpu_var
> +#define per_cpu_var(x)       x
> +#endif

Please move those soon-to-be-generic bits to asm-generic/wrappers.h,
into a section that would be unconditionally parsed with 2.6.34 or
later.

TIA,

>  /*
>   * We have an added complexity with -fstack-protector, due to the
>   * hybrid scheduling between user- and kernel-based Xenomai threads,


-- 
Philippe.



_______________________________________________
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

Reply via email to