diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /arch/avr32 | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/include/asm/ftrace.h | 1 | ||||
| -rw-r--r-- | arch/avr32/include/asm/hardirq.h | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/avr32/include/asm/ftrace.h b/arch/avr32/include/asm/ftrace.h new file mode 100644 index 000000000000..40a8c178f10d --- /dev/null +++ b/arch/avr32/include/asm/ftrace.h | |||
| @@ -0,0 +1 @@ | |||
| /* empty */ | |||
diff --git a/arch/avr32/include/asm/hardirq.h b/arch/avr32/include/asm/hardirq.h index 267354356f60..015bc75ea798 100644 --- a/arch/avr32/include/asm/hardirq.h +++ b/arch/avr32/include/asm/hardirq.h | |||
| @@ -20,15 +20,4 @@ void ack_bad_irq(unsigned int irq); | |||
| 20 | 20 | ||
| 21 | #endif /* __ASSEMBLY__ */ | 21 | #endif /* __ASSEMBLY__ */ |
| 22 | 22 | ||
| 23 | #define HARDIRQ_BITS 12 | ||
| 24 | |||
| 25 | /* | ||
| 26 | * The hardirq mask has to be large enough to have | ||
| 27 | * space for potentially all IRQ sources in the system | ||
| 28 | * nesting on a single CPU: | ||
| 29 | */ | ||
| 30 | #if (1 << HARDIRQ_BITS) < NR_IRQS | ||
| 31 | # error HARDIRQ_BITS is too low! | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #endif /* __ASM_AVR32_HARDIRQ_H */ | 23 | #endif /* __ASM_AVR32_HARDIRQ_H */ |