diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 19:34:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 19:34:54 -0800 |
| commit | a58b228fe0f1ffe2b23a15195cbd5c9021e15ce3 (patch) | |
| tree | bbc7069fa69bb861a468da6b81e3ada1ac3ae848 /include | |
| parent | 8bdf7c399df1129f0cdf1e0b5a248d8919158a57 (diff) | |
| parent | d6699e96022a8d645374e82e597bb532b0cce564 (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 24 | ||||
| -rw-r--r-- | include/asm-i386/module.h | 44 |
2 files changed, 68 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h new file mode 100644 index 000000000000..8f1f4974f1f4 --- /dev/null +++ b/include/asm-generic/vmlinux.lds.h @@ -0,0 +1,24 @@ +#define RODATA \ + .rodata : { *(.rodata) *(.rodata.*) *(.rodata1) } \ + .rodata1 : { *(.rodata1) } \ + \ + .kstrtab : { *(.kstrtab) } \ + \ + /* Kernel version magic */ \ + __vermagic : { *(__vermagic) } \ + \ + /* Kernel symbol table */ \ + . = ALIGN(64); \ + __start___ksymtab = .; \ + __ksymtab : { *(__ksymtab) } \ + __stop___ksymtab = .; \ + \ + /* Kernel symbol table: GPL-only symbols */ \ + __start___gpl_ksymtab = .; \ + __gpl_ksymtab : { *(__gpl_ksymtab) } \ + __stop___gpl_ksymtab = .; \ + \ + /* All kernel symbols */ \ + __start___kallsyms = .; \ + __kallsyms : { *(__kallsyms) } \ + __stop___kallsyms = .; \ diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h index 1a480b64d876..0accded7894d 100644 --- a/include/asm-i386/module.h +++ b/include/asm-i386/module.h @@ -1,5 +1,6 @@ #ifndef _ASM_I386_MODULE_H #define _ASM_I386_MODULE_H + /* x86 is simple */ struct mod_arch_specific { @@ -8,4 +9,47 @@ struct mod_arch_specific #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym #define Elf_Ehdr Elf32_Ehdr + +#ifdef CONFIG_M386 +#define MODULE_PROC_FAMILY "386 " +#elif CONFIG_M486 +#define MODULE_PROC_FAMILY "486 " +#elif CONFIG_M586 +#define MODULE_PROC_FAMILY "586 " +#elif CONFIG_M586TSC +#define MODULE_PROC_FAMILY "586TSC " +#elif CONFIG_M586MMX +#define MODULE_PROC_FAMILY "586MMX " +#elif CONFIG_M686 +#define MODULE_PROC_FAMILY "686 " +#elif CONFIG_MPENTIUMII +#define MODULE_PROC_FAMILY "PENTIUMII " +#elif CONFIG_MPENTIUMIII +#define MODULE_PROC_FAMILY "PENTIUMIII " +#elif CONFIG_MPENTIUM4 +#define MODULE_PROC_FAMILY "PENTIUM4 " +#elif CONFIG_MK6 +#define MODULE_PROC_FAMILY "K6 " +#elif CONFIG_MK7 +#define MODULE_PROC_FAMILY "K7 " +#elif CONFIG_MK8 +#define MODULE_PROC_FAMILY "K8 " +#elif CONFIG_MELAN +#define MODULE_PROC_FAMILY "ELAN " +#elif CONFIG_MCRUSOE +#define MODULE_PROC_FAMILY "CRUSOE " +#elif CONFIG_MWINCHIPC6 +#define MODULE_PROC_FAMILY "WINCHIPC6 " +#elif CONFIG_MWINCHIP2 +#define MODULE_PROC_FAMILY "WINCHIP2 " +#elif CONFIG_MWINCHIP3D +#define MODULE_PROC_FAMILY "WINCHIP3D " +#elif CONFIG_MCYRIXIII +#define MODULE_PROC_FAMILY "CYRIXIII " +#else +#error unknown processor family +#endif + +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY + #endif /* _ASM_I386_MODULE_H */ |