linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC] RISC-V: Fix !CONFIG_SMP compilation error
@ 2018-08-06 23:17 Atish Patra
  2018-08-10 18:31 ` Atish Patra
  0 siblings, 1 reply; 3+ messages in thread
From: Atish Patra @ 2018-08-06 23:17 UTC (permalink / raw)
  To: linux-riscv, palmer, alankao, sols
  Cc: peterz, nickhu, acme, jolsa, namhyung, linux-kernel, atish.patra

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>
---
 arch/riscv/include/asm/perf_event.h | 1 +
 arch/riscv/kernel/perf_event.c      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h
index 0e638a0c..aefbfaa6 100644
--- a/arch/riscv/include/asm/perf_event.h
+++ b/arch/riscv/include/asm/perf_event.h
@@ -10,6 +10,7 @@
 
 #include <linux/perf_event.h>
 #include <linux/ptrace.h>
+#include <linux/interrupt.h>
 
 #define RISCV_BASE_COUNTERS	2
 
diff --git a/arch/riscv/kernel/perf_event.c b/arch/riscv/kernel/perf_event.c
index b0e10c4e..a243fae1 100644
--- a/arch/riscv/kernel/perf_event.c
+++ b/arch/riscv/kernel/perf_event.c
@@ -27,7 +27,6 @@
 #include <linux/mutex.h>
 #include <linux/bitmap.h>
 #include <linux/irq.h>
-#include <linux/interrupt.h>
 #include <linux/perf_event.h>
 #include <linux/atomic.h>
 #include <linux/of.h>
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [RFC] RISC-V: Fix !CONFIG_SMP compilation error
  2018-08-06 23:17 [RFC] RISC-V: Fix !CONFIG_SMP compilation error Atish Patra
@ 2018-08-10 18:31 ` Atish Patra
  2018-08-10 20:55   ` Palmer Dabbelt
  0 siblings, 1 reply; 3+ messages in thread
From: Atish Patra @ 2018-08-10 18:31 UTC (permalink / raw)
  To: linux-riscv, palmer, alankao, sols
  Cc: peterz, nickhu, acme, jolsa, namhyung, linux-kernel

On 8/6/18 4:17 PM, Atish Patra wrote:
> 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>
> ---
>   arch/riscv/include/asm/perf_event.h | 1 +
>   arch/riscv/kernel/perf_event.c      | 1 -
>   2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h
> index 0e638a0c..aefbfaa6 100644
> --- a/arch/riscv/include/asm/perf_event.h
> +++ b/arch/riscv/include/asm/perf_event.h
> @@ -10,6 +10,7 @@
>   
>   #include <linux/perf_event.h>
>   #include <linux/ptrace.h>
> +#include <linux/interrupt.h>
>   
>   #define RISCV_BASE_COUNTERS	2
>   
> diff --git a/arch/riscv/kernel/perf_event.c b/arch/riscv/kernel/perf_event.c
> index b0e10c4e..a243fae1 100644
> --- a/arch/riscv/kernel/perf_event.c
> +++ b/arch/riscv/kernel/perf_event.c
> @@ -27,7 +27,6 @@
>   #include <linux/mutex.h>
>   #include <linux/bitmap.h>
>   #include <linux/irq.h>
> -#include <linux/interrupt.h>
>   #include <linux/perf_event.h>
>   #include <linux/atomic.h>
>   #include <linux/of.h>
> 
ping ?

Regards,
Atish

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [RFC] RISC-V: Fix !CONFIG_SMP compilation error
  2018-08-10 18:31 ` Atish Patra
@ 2018-08-10 20:55   ` Palmer Dabbelt
  0 siblings, 0 replies; 3+ messages in thread
From: Palmer Dabbelt @ 2018-08-10 20:55 UTC (permalink / raw)
  To: atish.patra
  Cc: linux-riscv, alankao, sols, peterz, nickhu, acme, jolsa,
	namhyung, linux-kernel

On Fri, 10 Aug 2018 11:31:08 PDT (-0700), atish.patra@wdc.com wrote:
> On 8/6/18 4:17 PM, Atish Patra wrote:
>> 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>
>> ---
>>   arch/riscv/include/asm/perf_event.h | 1 +
>>   arch/riscv/kernel/perf_event.c      | 1 -
>>   2 files changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/riscv/include/asm/perf_event.h b/arch/riscv/include/asm/perf_event.h
>> index 0e638a0c..aefbfaa6 100644
>> --- a/arch/riscv/include/asm/perf_event.h
>> +++ b/arch/riscv/include/asm/perf_event.h
>> @@ -10,6 +10,7 @@
>>
>>   #include <linux/perf_event.h>
>>   #include <linux/ptrace.h>
>> +#include <linux/interrupt.h>
>>
>>   #define RISCV_BASE_COUNTERS	2
>>
>> diff --git a/arch/riscv/kernel/perf_event.c b/arch/riscv/kernel/perf_event.c
>> index b0e10c4e..a243fae1 100644
>> --- a/arch/riscv/kernel/perf_event.c
>> +++ b/arch/riscv/kernel/perf_event.c
>> @@ -27,7 +27,6 @@
>>   #include <linux/mutex.h>
>>   #include <linux/bitmap.h>
>>   #include <linux/irq.h>
>> -#include <linux/interrupt.h>
>>   #include <linux/perf_event.h>
>>   #include <linux/atomic.h>
>>   #include <linux/of.h>
>>
> ping ?

Sorry about this, it got dropped.  This looks fine and fixes the bug, so I've 
gone and put it on for-next.

Thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-10 20:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-06 23:17 [RFC] RISC-V: Fix !CONFIG_SMP compilation error Atish Patra
2018-08-10 18:31 ` Atish Patra
2018-08-10 20:55   ` Palmer Dabbelt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).