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

Commit d27ecef7 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: asm offsets duplication removal 



Unify macros common to x86 and x86_64 kernel-offsets.h files.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2465b858

arch/um/include/common-offsets.h

+10 −0
Original line number Original line Diff line number Diff line 
/* for use by sys-$SUBARCH/kernel-offsets.c */

/* for use by sys-$SUBARCH/kernel-offsets.c */





DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);

#ifdef CONFIG_MODE_TT

OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);

#endif



OFFSET(HOST_TASK_REGS, task_struct, thread.regs);

OFFSET(HOST_TASK_REGS, task_struct, thread.regs);

OFFSET(HOST_TASK_PID, task_struct, pid);

OFFSET(HOST_TASK_PID, task_struct, pid);



DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);

DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);

DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);

DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);



DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);

DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);

DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);

DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);

DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);

DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);
@@ -12,7 +19,10 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING); 
DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);

DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);

DEFINE_STR(UM_KERN_INFO, KERN_INFO);

DEFINE_STR(UM_KERN_INFO, KERN_INFO);

DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);

DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);



DEFINE(UM_ELF_CLASS, ELF_CLASS);

DEFINE(UM_ELF_CLASS, ELF_CLASS);

DEFINE(UM_ELFCLASS32, ELFCLASS32);

DEFINE(UM_ELFCLASS32, ELFCLASS32);

DEFINE(UM_ELFCLASS64, ELFCLASS64);

DEFINE(UM_ELFCLASS64, ELFCLASS64);



/* For crypto assembler code. */

DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
 
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));

arch/um/include/sysdep-i386/kernel-offsets.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -18,9 +18,5 @@ 
void foo(void)

void foo(void)

{

{

	OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);

	OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);

	DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);

#ifdef CONFIG_MODE_TT

	OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);

#endif

#include <common-offsets.h>

#include <common-offsets.h>

}
 
}

arch/um/include/sysdep-x86_64/kernel-offsets.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -19,9 +19,5 @@ 




void foo(void)

void foo(void)

{

{

	DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);

#ifdef CONFIG_MODE_TT

	OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);

#endif

#include <common-offsets.h>

#include <common-offsets.h>

}
 
}