2012-10-11 09:17:32

by James Hogan

Subject: [PATCH] cris: use kbuild.h instead of defining macros in asm-offset.c

This is modelled on commits such as the one below:

Commit fc1c3a003edb8a6778e64e10ef671a38c76c969e ("sh: use kbuild.h
instead of defining macros in asm-offsets.c") introduced in v2.6.26.

Signed-off-by: James Hogan <[email protected]>
---
Note I haven't tested compilation on cris. I'd appreciate if somebody
could check it doesn't break anything.

arch/cris/kernel/asm-offsets.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/cris/kernel/asm-offsets.c b/arch/cris/kernel/asm-offsets.c
index dd7b8e9..a5fd88d 100644
--- a/arch/cris/kernel/asm-offsets.c
+++ b/arch/cris/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+#include <linux/kbuild.h>
#include <linux/sched.h>
#include <asm/thread_info.h>

@@ -7,11 +8,6 @@
* and format the required data.
*/

-#define DEFINE(sym, val) \
- asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
#if !defined(CONFIG_ETRAX_ARCH_V10) && !defined(CONFIG_ETRAX_ARCH_V32)
#error One of ARCH v10 and ARCH v32 must be true!
#endif
--
1.7.7.6

2012-10-12 07:33:14

by Jesper Nilsson

Subject: Re: [PATCH] cris: use kbuild.h instead of defining macros in asm-offset.c

On Thu, Oct 11, 2012 at 10:00:58AM +0100, James Hogan wrote:
> This is modelled on commits such as the one below:
>
> Commit fc1c3a003edb8a6778e64e10ef671a38c76c969e ("sh: use kbuild.h
> instead of defining macros in asm-offsets.c") introduced in v2.6.26.

Looks good here, I'll take it into the CRIS tree. Thanks!

> Signed-off-by: James Hogan <[email protected]>

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]