2008-10-25 18:15:18

by Steven Rostedt

Subject: Re: [PATCH] Define DIE_OOPS in asm-generic

Jonas Bonn wrote:
> DIE_OOPS is now used in the generic trace handling code so it needs to
> be defined for all architectures. Define it in asm-generic so that it's
> available to all by default and doesn't cause build errors for
> architectures that rely on the generic implementation.
>
> Signed-off-by: Jonas Bonn <[email protected]>
> ---
> include/asm-generic/kdebug.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>

This will obsolete my other patch. (the one making the nmi handler weak)

Acked-by: Steven Rostedt <[email protected]>

-- Steve

> diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h
> index 2b799c9..11e57b6 100644
> --- a/include/asm-generic/kdebug.h
> +++ b/include/asm-generic/kdebug.h
> @@ -3,6 +3,7 @@
>
> enum die_val {
> DIE_UNUSED,
> + DIE_OOPS=1
> };
>
> #endif /* _ASM_GENERIC_KDEBUG_H */
>

2008-10-27 10:40:49

by Ingo Molnar

Subject: [PATCH] asm-generic: define DIE_OOPS in asm-generic

* Steven Rostedt <[email protected]> wrote:

> Jonas Bonn wrote:
>> DIE_OOPS is now used in the generic trace handling code so it needs to
>> be defined for all architectures. Define it in asm-generic so that it's
>> available to all by default and doesn't cause build errors for
>> architectures that rely on the generic implementation.
>>
>> Signed-off-by: Jonas Bonn <[email protected]>
>> ---
>> include/asm-generic/kdebug.h | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>
> This will obsolete my other patch. (the one making the nmi handler weak)
>
> Acked-by: Steven Rostedt <[email protected]>
>
> -- Steve

ok - i've queued up the patch below in tip/tracing/urgent, thanks
guys.

Ingo

>From 5209f08dc8e5f520ca81b87fa9a7142f58a109f4 Mon Sep 17 00:00:00 2001
From: Jonas Bonn <[email protected]>
Date: Sat, 25 Oct 2008 11:49:20 +0200
Subject: [PATCH] asm-generic: define DIE_OOPS in asm-generic

Impact: build fix

DIE_OOPS is now used in the generic trace handling code so it needs to
be defined for all architectures. Define it in asm-generic so that it's
available to all by default and doesn't cause build errors for
architectures that rely on the generic implementation.

Signed-off-by: Jonas Bonn <[email protected]>
Acked-by: Steven Rostedt <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/asm-generic/kdebug.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h
index 2b799c9..11e57b6 100644
--- a/include/asm-generic/kdebug.h
+++ b/include/asm-generic/kdebug.h
@@ -3,6 +3,7 @@

enum die_val {
DIE_UNUSED,
+ DIE_OOPS=1
};

#endif /* _ASM_GENERIC_KDEBUG_H */