diff options
author | Anton Blanchard <anton@samba.org> | 2015-04-08 23:51:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-09 03:40:23 -0400 |
commit | 55dd0df781e58ec23d218376ea4a676e7362a98c (patch) | |
tree | 2401cee7d708bb538a2ed0251f675a01cda71407 /arch/arm/include/asm | |
parent | 01ac33c1f907b366dcc50551316b372f1519cca9 (diff) |
jump_label: Allow asm/jump_label.h to be included in assembly
Wrap asm/jump_label.h for all archs with #ifndef __ASSEMBLY__.
Since these are kernel only headers, we don't need #ifdef
__KERNEL__ so can simplify things a bit.
If an architecture wants to use jump labels in assembly, it
will still need to define a macro to create the __jump_table
entries (see ARCH_STATIC_BRANCH in the powerpc asm/jump_label.h
for an example).
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: benh@kernel.crashing.org
Cc: catalin.marinas@arm.com
Cc: davem@davemloft.net
Cc: heiko.carstens@de.ibm.com
Cc: jbaron@akamai.com
Cc: linux@arm.linux.org.uk
Cc: linuxppc-dev@lists.ozlabs.org
Cc: liuj97@gmail.com
Cc: mgorman@suse.de
Cc: mmarek@suse.cz
Cc: mpe@ellerman.id.au
Cc: paulus@samba.org
Cc: ralf@linux-mips.org
Cc: rostedt@goodmis.org
Cc: schwidefsky@de.ibm.com
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/1428551492-21977-1-git-send-email-anton@samba.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r-- | arch/arm/include/asm/jump_label.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h index 70f9b9bfb1f9..5f337dc5c108 100644 --- a/arch/arm/include/asm/jump_label.h +++ b/arch/arm/include/asm/jump_label.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ASM_ARM_JUMP_LABEL_H | 1 | #ifndef _ASM_ARM_JUMP_LABEL_H |
2 | #define _ASM_ARM_JUMP_LABEL_H | 2 | #define _ASM_ARM_JUMP_LABEL_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifndef __ASSEMBLY__ |
5 | 5 | ||
6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
7 | 7 | ||
@@ -27,8 +27,6 @@ l_yes: | |||
27 | return true; | 27 | return true; |
28 | } | 28 | } |
29 | 29 | ||
30 | #endif /* __KERNEL__ */ | ||
31 | |||
32 | typedef u32 jump_label_t; | 30 | typedef u32 jump_label_t; |
33 | 31 | ||
34 | struct jump_entry { | 32 | struct jump_entry { |
@@ -37,4 +35,5 @@ struct jump_entry { | |||
37 | jump_label_t key; | 35 | jump_label_t key; |
38 | }; | 36 | }; |
39 | 37 | ||
38 | #endif /* __ASSEMBLY__ */ | ||
40 | #endif | 39 | #endif |