diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-09-09 17:56:47 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-09-10 10:46:32 -0700 |
commit | 4611a771fc8e5ad77d27f25268846abb425101a0 (patch) | |
tree | 0c897e70d6ae6a810dfa2f4be8a6aaba7d33e8f1 /arch/ia64/kernel | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | blackbird-op-linux-4611a771fc8e5ad77d27f25268846abb425101a0.tar.gz blackbird-op-linux-4611a771fc8e5ad77d27f25268846abb425101a0.zip |
[IA64] fix compile failure with non modular builds
Broke the non modular builds by moving an essential function into
modules.c. Fix this by moving it out again and into asm/sections.h as
an inline. To do this, the definitions of struct fdesc and struct
got_val have been lifted out of modules.c and put in asm/elf.h where
they belong.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/module.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 545626f66a4c..aaa7d901521f 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -31,11 +31,9 @@ #include <linux/elf.h> #include <linux/moduleloader.h> #include <linux/string.h> -#include <linux/uaccess.h> #include <linux/vmalloc.h> #include <asm/patch.h> -#include <asm/sections.h> #include <asm/unaligned.h> #define ARCH_MODULE_DEBUG 0 @@ -137,15 +135,6 @@ static const char *reloc_name[256] = { #undef N -struct got_entry { - uint64_t val; -}; - -struct fdesc { - uint64_t ip; - uint64_t gp; -}; - /* Opaque struct for insns, to protect against derefs. */ struct insn; @@ -943,13 +932,3 @@ module_arch_cleanup (struct module *mod) if (mod->arch.core_unw_table) unw_remove_unwind_table(mod->arch.core_unw_table); } - -void *dereference_function_descriptor(void *ptr) -{ - struct fdesc *desc = ptr; - void *p; - - if (!probe_kernel_address(&desc->ip, p)) - ptr = p; - return ptr; -} |