Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66916cd2 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

x86: use kbuild.h 



Drop the macro definitions in asm-offsets_*.c and use kbuild.h

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37487a56

arch/x86/kernel/asm-offsets_32.c

+1 −8
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/signal.h>

#include <linux/personality.h>

#include <linux/suspend.h>

#include <linux/kbuild.h>

#include <asm/ucontext.h>

#include "sigframe.h"

#include <asm/pgtable.h>
@@ -23,14 +24,6 @@ 
#include <linux/lguest.h>

#include "../../../drivers/lguest/lg.h"



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))



#define BLANK() asm volatile("\n->" : : )



#define OFFSET(sym, str, mem) \

	DEFINE(sym, offsetof(struct str, mem));



/* workaround for a warning with -Wmissing-prototypes */

void foo(void);

arch/x86/kernel/asm-offsets_64.c

+1 −8
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/errno.h> 

#include <linux/hardirq.h>

#include <linux/suspend.h>

#include <linux/kbuild.h>

#include <asm/pda.h>

#include <asm/processor.h>

#include <asm/segment.h>
@@ -17,14 +18,6 @@ 
#include <asm/ia32.h>

#include <asm/bootparam.h>



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))



#define BLANK() asm volatile("\n->" : : )



#define OFFSET(sym, str, mem) \

	DEFINE(sym, offsetof(struct str, mem))



#define __NO_STUBS 1

#undef __SYSCALL

#undef _ASM_X86_64_UNISTD_H_