Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b609308e authored by Kyle McMartin's avatar Kyle McMartin
Browse files

parisc: move dereference_function_descriptor to process.c 



Commit deac93df 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: default avatarKyle McMartin <kyle@mcmartin.ca>
parent bf589a34

arch/parisc/kernel/module.c

+0 −14
Original line number Diff line number Diff line
@@ -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
@@ -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

arch/parisc/kernel/process.c

+14 −1
Original line number Diff line number Diff line
@@ -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
@@ -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