Skip to content

Commit

Permalink
parisc: move dereference_function_descriptor to process.c
Browse files Browse the repository at this point in the history
Commit deac93d fixed up printing
of %pF on parisc, but added the dereference_function_descriptor
prototype to module.c... this isn't a particularly wise idea as
module.c might not always be compiled.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  • Loading branch information
Kyle McMartin committed Apr 2, 2009
1 parent bf589a3 commit b609308
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
14 changes: 0 additions & 14 deletions arch/parisc/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/bug.h>
#include <linux/uaccess.h>

#include <asm/sections.h>
#include <asm/unwind.h>

#if 0
Expand Down Expand Up @@ -912,15 +910,3 @@ void module_arch_cleanup(struct module *mod)
deregister_unwind_table(mod);
module_bug_cleanup(mod);
}

#ifdef CONFIG_64BIT
void *dereference_function_descriptor(void *ptr)
{
Elf64_Fdesc *desc = ptr;
void *p;

if (!probe_kernel_address(&desc->addr, p))
ptr = p;
return ptr;
}
#endif
15 changes: 14 additions & 1 deletion arch/parisc/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,15 @@
#include <linux/stddef.h>
#include <linux/unistd.h>
#include <linux/kallsyms.h>
#include <linux/uaccess.h>

#include <asm/io.h>
#include <asm/asm-offsets.h>
#include <asm/pdc.h>
#include <asm/pdc_chassis.h>
#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include <asm/unwind.h>
#include <asm/sections.h>

/*
* The idle thread. There's no useful work to be
Expand Down Expand Up @@ -390,3 +391,15 @@ get_wchan(struct task_struct *p)
} while (count++ < 16);
return 0;
}

#ifdef CONFIG_64BIT
void *dereference_function_descriptor(void *ptr)
{
Elf64_Fdesc *desc = ptr;
void *p;

if (!probe_kernel_address(&desc->addr, p))
ptr = p;
return ptr;
}
#endif

0 comments on commit b609308

Please sign in to comment.