diff options
author | Steven Rostedt <srostedt@redhat.com> | 2011-07-24 04:47:58 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-07-24 04:48:00 -0400 |
commit | f433c4aec9999d1bf2ed8c328196f3b0ad5f75db (patch) | |
tree | 8bdce41f37b46bdb9e23638fae5aedc5eff72270 /arch/s390/include | |
parent | 284ecb00644cf28e5f530f92b4f820cb78f023aa (diff) |
[S390] irqs: Do not trace arch_local_{*,irq_*} functions
Do not trace arch_local_save_flags(), arch_local_irq_*() and friends.
Although they are marked inline, gcc may still make a function out of
them and add it to the pool of functions that are traced by the function
tracer. This can cause undesirable results (kernel panic, triple faults,
etc).
Add the notrace notation to prevent them from ever being traced.
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r-- | arch/s390/include/asm/irqflags.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h index 865d6d891ace..38fdf451febb 100644 --- a/arch/s390/include/asm/irqflags.h +++ b/arch/s390/include/asm/irqflags.h | |||
@@ -29,42 +29,42 @@ | |||
29 | }) | 29 | }) |
30 | 30 | ||
31 | /* set system mask. */ | 31 | /* set system mask. */ |
32 | static inline void __arch_local_irq_ssm(unsigned long flags) | 32 | static inline notrace void __arch_local_irq_ssm(unsigned long flags) |
33 | { | 33 | { |
34 | asm volatile("ssm %0" : : "Q" (flags) : "memory"); | 34 | asm volatile("ssm %0" : : "Q" (flags) : "memory"); |
35 | } | 35 | } |
36 | 36 | ||
37 | static inline unsigned long arch_local_save_flags(void) | 37 | static inline notrace unsigned long arch_local_save_flags(void) |
38 | { | 38 | { |
39 | return __arch_local_irq_stosm(0x00); | 39 | return __arch_local_irq_stosm(0x00); |
40 | } | 40 | } |
41 | 41 | ||
42 | static inline unsigned long arch_local_irq_save(void) | 42 | static inline notrace unsigned long arch_local_irq_save(void) |
43 | { | 43 | { |
44 | return __arch_local_irq_stnsm(0xfc); | 44 | return __arch_local_irq_stnsm(0xfc); |
45 | } | 45 | } |
46 | 46 | ||
47 | static inline void arch_local_irq_disable(void) | 47 | static inline notrace void arch_local_irq_disable(void) |
48 | { | 48 | { |
49 | arch_local_irq_save(); | 49 | arch_local_irq_save(); |
50 | } | 50 | } |
51 | 51 | ||
52 | static inline void arch_local_irq_enable(void) | 52 | static inline notrace void arch_local_irq_enable(void) |
53 | { | 53 | { |
54 | __arch_local_irq_stosm(0x03); | 54 | __arch_local_irq_stosm(0x03); |
55 | } | 55 | } |
56 | 56 | ||
57 | static inline void arch_local_irq_restore(unsigned long flags) | 57 | static inline notrace void arch_local_irq_restore(unsigned long flags) |
58 | { | 58 | { |
59 | __arch_local_irq_ssm(flags); | 59 | __arch_local_irq_ssm(flags); |
60 | } | 60 | } |
61 | 61 | ||
62 | static inline bool arch_irqs_disabled_flags(unsigned long flags) | 62 | static inline notrace bool arch_irqs_disabled_flags(unsigned long flags) |
63 | { | 63 | { |
64 | return !(flags & (3UL << (BITS_PER_LONG - 8))); | 64 | return !(flags & (3UL << (BITS_PER_LONG - 8))); |
65 | } | 65 | } |
66 | 66 | ||
67 | static inline bool arch_irqs_disabled(void) | 67 | static inline notrace bool arch_irqs_disabled(void) |
68 | { | 68 | { |
69 | return arch_irqs_disabled_flags(arch_local_save_flags()); | 69 | return arch_irqs_disabled_flags(arch_local_save_flags()); |
70 | } | 70 | } |