[Adeos-main] [PATCH] Fix include for kernel/panic.c

[Adeos-main] [PATCH] Fix include for kernel/panic.c

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

Not all archs include ipipe_trace.h implicitly so that bulding
kernel/panic.c may break in oops_enter (seen on ARM with tracer
disabled). Fix this with a proper include.

Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>

---
 kernel/panic.c |    1 +
 1 file changed, 1 insertion(+)

Index: b/kernel/panic.c
===================================================================
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -21,6 +21,7 @@
 #include <linux/debug_locks.h>
 #include <linux/random.h>
 #include <linux/kallsyms.h>
+#include <linux/ipipe_trace.h>
 
 int panic_on_oops;
 int tainted;


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Gilles Chanteperdrix]

Jan Kiszka wrote:
> +++ b/kernel/panic.c
> @@ -21,6 +21,7 @@
>  #include <linux/debug_locks.h>
>  #include <linux/random.h>
>  #include <linux/kallsyms.h>
> +#include <linux/ipipe_trace.h>

That is not enough, when compiling a kernel without I-pipe enabled, the
compiler complains about ipipe_processor_id.

-- 
                                                 Gilles.

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Gilles Chanteperdrix wrote:
> Jan Kiszka wrote:
>> +++ b/kernel/panic.c
>> @@ -21,6 +21,7 @@
>>  #include <linux/debug_locks.h>
>>  #include <linux/random.h>
>>  #include <linux/kallsyms.h>
>> +#include <linux/ipipe_trace.h>
> 
> That is not enough, when compiling a kernel without I-pipe enabled, the
> compiler complains about ipipe_processor_id.

Good point. But I wonder where the ipipe_processor_id wrapper for the
disabled case is - can't find it in adeos-ipipe-2.6.26-arm-1.11-02.patch
right now.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Gilles Chanteperdrix]

Jan Kiszka wrote:
> Gilles Chanteperdrix wrote:
>> Jan Kiszka wrote:
>>> +++ b/kernel/panic.c
>>> @@ -21,6 +21,7 @@
>>>  #include <linux/debug_locks.h>
>>>  #include <linux/random.h>
>>>  #include <linux/kallsyms.h>
>>> +#include <linux/ipipe_trace.h>
>> That is not enough, when compiling a kernel without I-pipe enabled, the
>> compiler complains about ipipe_processor_id.
> 
> Good point. But I wonder where the ipipe_processor_id wrapper for the
> disabled case is - can't find it in adeos-ipipe-2.6.26-arm-1.11-02.patch
> right now.

It does not exist.

-- 
                                                 Gilles.

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

Gilles Chanteperdrix wrote:
> Jan Kiszka wrote:
>> Gilles Chanteperdrix wrote:
>>> Jan Kiszka wrote:
>>>> +++ b/kernel/panic.c
>>>> @@ -21,6 +21,7 @@
>>>>  #include <linux/debug_locks.h>
>>>>  #include <linux/random.h>
>>>>  #include <linux/kallsyms.h>
>>>> +#include <linux/ipipe_trace.h>
>>> That is not enough, when compiling a kernel without I-pipe enabled, the
>>> compiler complains about ipipe_processor_id.
>> Good point. But I wonder where the ipipe_processor_id wrapper for the
>> disabled case is - can't find it in adeos-ipipe-2.6.26-arm-1.11-02.patch
>> right now.
> 
> It does not exist.

Ah, I see now. This hunk from my ipipe-lttng patch is required upstream:

Index: b/include/linux/ipipe.h
===================================================================
--- a/include/linux/ipipe.h
+++ b/include/linux/ipipe.h
@@ -534,7 +534,8 @@ static inline void local_irq_restore_nos
 #define ipipe_irq_unlock(irq)		do { } while(0)
 
 #define ipipe_root_domain_p		1
-#define ipipe_safe_current		current
+#define ipipe_processor_id()		smp_processor_id()
+#define ipipe_safe_current()		current
 
 #define local_irq_disable_head()	local_irq_disable()
 

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Philippe Gerum]

Jan Kiszka wrote:
> Gilles Chanteperdrix wrote:
>> Jan Kiszka wrote:
>>> +++ b/kernel/panic.c
>>> @@ -21,6 +21,7 @@
>>>  #include <linux/debug_locks.h>
>>>  #include <linux/random.h>
>>>  #include <linux/kallsyms.h>
>>> +#include <linux/ipipe_trace.h>
>> That is not enough, when compiling a kernel without I-pipe enabled, the
>> compiler complains about ipipe_processor_id.
> 
> Good point. But I wonder where the ipipe_processor_id wrapper for the
> disabled case is - can't find it in adeos-ipipe-2.6.26-arm-1.11-02.patch
> right now.
>

I have a pending fix for this one as well. I'll push my tree tomorrow.

> Jan
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Adeos-main mailing list
> Adeos-main@domain.hid
> https://mail.gna.org/listinfo/adeos-main


-- 
Philippe.

Re: [Adeos-main] [PATCH] Fix include for kernel/panic.c

[Philippe Gerum]

Jan Kiszka wrote:
> Not all archs include ipipe_trace.h implicitly so that bulding
> kernel/panic.c may break in oops_enter (seen on ARM with tracer
> disabled). Fix this with a proper include.
>

Thanks. Fix a bit earlier on ppc as well. I will push my tree soon now since
things seem to have gone back to normal wrt 2.6.27.

> Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
> 
> ---
>  kernel/panic.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> Index: b/kernel/panic.c
> ===================================================================
> --- a/kernel/panic.c
> +++ b/kernel/panic.c
> @@ -21,6 +21,7 @@
>  #include <linux/debug_locks.h>
>  #include <linux/random.h>
>  #include <linux/kallsyms.h>
> +#include <linux/ipipe_trace.h>
>  
>  int panic_on_oops;
>  int tainted;
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Adeos-main mailing list
> Adeos-main@domain.hid
> https://mail.gna.org/listinfo/adeos-main


-- 
Philippe.