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

Commit e7b7e0c3 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: drop btfixup for alloc_thread_info_node/free_thread_info 



Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 323206a1

arch/sparc/include/asm/thread_info_32.h

+2 −5
Original line number Diff line number Diff line
@@ -82,11 +82,8 @@ register struct thread_info *current_thread_info_reg asm("g6"); 


#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR



BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info_node, int)

#define alloc_thread_info_node(tsk, node) BTFIXUP_CALL(alloc_thread_info_node)(node)



BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)

#define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)

struct thread_info * alloc_thread_info_node(struct task_struct *tsk, int node);

void free_thread_info(struct thread_info *);



#endif /* __ASSEMBLY__ */

arch/sparc/mm/srmmu.c

+2 −5
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static void srmmu_unmapiorange(unsigned long virt_addr, unsigned int len) 
 * mappings on the kernel stack without any special code as we did

 * need on the sun4c.

 */

static struct thread_info *srmmu_alloc_thread_info_node(int node)

struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)

{

	struct thread_info *ret;
@@ -664,7 +664,7 @@ static struct thread_info *srmmu_alloc_thread_info_node(int node) 
	return ret;

}



static void srmmu_free_thread_info(struct thread_info *ti)

void free_thread_info(struct thread_info *ti)

{

	free_pages((unsigned long)ti, THREAD_INFO_ORDER);

}
@@ -2250,9 +2250,6 @@ void __init ld_mmu_srmmu(void) 


	BTFIXUPSET_CALL(mmu_info, srmmu_mmu_info, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(alloc_thread_info_node, srmmu_alloc_thread_info_node, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(free_thread_info, srmmu_free_thread_info, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(pte_to_pgoff, srmmu_pte_to_pgoff, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pgoff_to_pte, srmmu_pgoff_to_pte, BTFIXUPCALL_NORM);