diff options
| author |   David Howells <dhowells@redhat.com> | 2011-12-13 15:07:49 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-12-13 15:07:49 +0000 |
| commit | 1632b9e2a14ce9f4e08faf6c4380431d63319bd3 (patch) | |
| tree | 572e45a2de74d233af5d98242bafbd193e074f43 /arch/ia64/include/asm/intrinsics.h | |
| parent | UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h (diff) | |
| download | linux-dev-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.tar.xz linux-dev-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.zip | |
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
Split trivial #if defined(__KERNEL__) && X conditionals to make automated
disintegration easier.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/ia64/include/asm/intrinsics.h')
| -rw-r--r-- | arch/ia64/include/asm/intrinsics.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h index 111ed5222892..e4076b511829 100644 --- a/arch/ia64/include/asm/intrinsics.h +++ b/arch/ia64/include/asm/intrinsics.h @@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); #endif #ifndef __ASSEMBLY__ -#if defined(CONFIG_PARAVIRT) && defined(__KERNEL__) -#ifdef ASM_SUPPORTED -# define IA64_INTRINSIC_API(name) paravirt_ ## name -#else -# define IA64_INTRINSIC_API(name) pv_cpu_ops.name -#endif -#define IA64_INTRINSIC_MACRO(name) paravirt_ ## name -#else + #define IA64_INTRINSIC_API(name) ia64_native_ ## name #define IA64_INTRINSIC_MACRO(name) ia64_native_ ## name + +#if defined(__KERNEL__) +#if defined(CONFIG_PARAVIRT) +# undef IA64_INTRINSIC_API +# undef IA64_INTRINSIC_MACRO +# ifdef ASM_SUPPORTED +# define IA64_INTRINSIC_API(name) paravirt_ ## name +# else +# define IA64_INTRINSIC_API(name) pv_cpu_ops.name +# endif +#define IA64_INTRINSIC_MACRO(name) paravirt_ ## name +#endif #endif /************************************************/ |