Re: [PATCH] x86: unify module_{32|64}.h

Sam Ravnborg
2007-12-18T18:22:33Z

On Tue, Dec 18, 2007 at 04:04:30AM -0800, Harvey Harrison wrote:
> This adds one case to the MODULE_PROC_FAMILY block testing
> for X86_64. There are no new things defined on X86_64 than
> there were before.
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> include/asm-x86/module.h | 83 +++++++++++++++++++++++++++++++++++++++++-
> include/asm-x86/module_32.h | 75 --------------------------------------
> include/asm-x86/module_64.h | 10 -----
> 3 files changed, 81 insertions(+), 87 deletions(-)
>
> diff --git a/include/asm-x86/module.h b/include/asm-x86/module.h
> index 2b2f18d..994837c 100644
> --- a/include/asm-x86/module.h
> +++ b/include/asm-x86/module.h
> @@ -1,5 +1,84 @@
> +#ifndef _ASM_MODULE_H
> +#define _ASM_MODULE_H
> +
> +/* x86_32/64 are simple */
> +struct mod_arch_specific
> +{
> +};
> +
> #ifdef CONFIG_X86_32
> -# include "module_32.h"
> +# define Elf_Shdr Elf32_Shdr
> +# define Elf_Sym Elf32_Sym
> +# define Elf_Ehdr Elf32_Ehdr
> #else
> -# include "module_64.h"
> +# define Elf_Shdr Elf64_Shdr
> +# define Elf_Sym Elf64_Sym
> +# define Elf_Ehdr Elf64_Ehdr
> #endif
> +
> +#ifdef CONFIG_X86_64
> +/* X86_64 does not define MODULE_PROC_FAMILY */

Why is MODULE_PROC_FAMILY not relevant for 64 bit x86?

Introducing it does not belong to a unification patch,
but a follow-up patch. But I guess we would like to distingush
on te selected processor when testing module compatibility
also for 64 bit x86.

Sam