diff options
author | Atish Patra <atish.patra@wdc.com> | 2018-08-06 19:17:36 -0400 |
---|---|---|
committer | Palmer Dabbelt <palmer@sifive.com> | 2018-08-13 11:31:32 -0400 |
commit | 4c42ae4f6ab78f9ce3fa7e66de44f666733288da (patch) | |
tree | e2f1609b55c979ba955320895c28aa5e5f9d70a0 | |
parent | 8237f8bc4f6eb7e5ce2a19276079cfd3a7c6314a (diff) |
RISC-V: Fix !CONFIG_SMP compilation error
Enabling both CONFIG_PERF_EVENTS without !CONFIG_SMP
generates following compilation error.
arch/riscv/include/asm/perf_event.h:80:2: error: expected
specifier-qualifier-list before 'irqreturn_t'
irqreturn_t (*handle_irq)(int irq_num, void *dev);
^~~~~~~~~~~
Include interrupt.h in proper place to avoid compilation
error.
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-rw-r--r-- | arch/riscv/include/asm/perf_event.h | 1 | ||||
-rw-r--r-- | arch/riscv/kernel/perf_event.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h index 0e638a0c3feb..aefbfaa6a781 100644 --- a/arch/riscv/include/asm/perf_event.h +++ b/arch/riscv/include/asm/perf_event.h | |||
@@ -10,6 +10,7 @@ | |||
10 | 10 | ||
11 | #include <linux/perf_event.h> | 11 | #include <linux/perf_event.h> |
12 | #include <linux/ptrace.h> | 12 | #include <linux/ptrace.h> |
13 | #include <linux/interrupt.h> | ||
13 | 14 | ||
14 | #define RISCV_BASE_COUNTERS 2 | 15 | #define RISCV_BASE_COUNTERS 2 |
15 | 16 | ||
diff --git a/arch/riscv/kernel/perf_event.c b/arch/riscv/kernel/perf_event.c index b0e10c4e9f77..a243fae1c1db 100644 --- a/arch/riscv/kernel/perf_event.c +++ b/arch/riscv/kernel/perf_event.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
28 | #include <linux/bitmap.h> | 28 | #include <linux/bitmap.h> |
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/interrupt.h> | ||
31 | #include <linux/perf_event.h> | 30 | #include <linux/perf_event.h> |
32 | #include <linux/atomic.h> | 31 | #include <linux/atomic.h> |
33 | #include <linux/of.h> | 32 | #include <linux/of.h> |