diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-12 19:37:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-12 19:37:24 -0800 |
| commit | 21846253621ce19ac8d7533053e9136ce22734b9 (patch) | |
| tree | 93d2b8b9b6c9fa66b25211ee2311efb79b15d0ac /include/linux | |
| parent | 7a362921f419abfacd4301ea89916ae144b7bfee (diff) | |
| parent | 377f9b8ccb78a65b00f67bd8b6eade4b69175911 (diff) | |
Merge bk://are.twiddle.net/mod-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/elf.h | 11 | ||||
| -rw-r--r-- | include/linux/moduleloader.h | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index 4435d0be3575..bef237b527bd 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -156,11 +156,12 @@ typedef __s64 Elf64_Sxword; #define STT_SECTION 3 #define STT_FILE 4 -#define ELF32_ST_BIND(x) ((x) >> 4) -#define ELF32_ST_TYPE(x) (((unsigned int) x) & 0xf) - -#define ELF64_ST_BIND(x) ((x) >> 4) -#define ELF64_ST_TYPE(x) (((unsigned int) x) & 0xf) +#define ELF_ST_BIND(x) ((x) >> 4) +#define ELF_ST_TYPE(x) (((unsigned int) x) & 0xf) +#define ELF32_ST_BIND(x) ELF_ST_BIND(x) +#define ELF32_ST_TYPE(x) ELF_ST_TYPE(x) +#define ELF64_ST_BIND(x) ELF_ST_BIND(x) +#define ELF64_ST_TYPE(x) ELF_ST_TYPE(x) /* Symbolic values for the entries in the auxiliary table put on the initial stack */ diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 991e9cdf3213..0c9e9a69f8ba 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -5,14 +5,6 @@ #include <linux/module.h> #include <linux/elf.h> -/* Helper function for arch-specific module loaders */ -unsigned long find_symbol_internal(Elf_Shdr *sechdrs, - unsigned int symindex, - const char *strtab, - const char *name, - struct module *mod, - struct kernel_symbol_group **group); - /* These must be implemented by the specific architecture */ /* Adjust arch-specific sections. Return 0 on success. */ |