aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-11 07:35:16 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-11 22:29:09 -0400
commite7b7e0c356558c4b8aa799a76a88031448ac19c7 (patch)
tree2df946e455bed9deb6f557ac4d7014ebb7cc1057 /arch/sparc
parent323206a1d5bb01883c3d81d163e4091904a92475 (diff)
sparc32: drop btfixup for alloc_thread_info_node/free_thread_info
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/thread_info_32.h7
-rw-r--r--arch/sparc/mm/srmmu.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index c2a1080cdd3b..74316de84d87 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -82,11 +82,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
82 82
83#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR 83#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
84 84
85BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info_node, int) 85struct thread_info * alloc_thread_info_node(struct task_struct *tsk, int node);
86#define alloc_thread_info_node(tsk, node) BTFIXUP_CALL(alloc_thread_info_node)(node) 86void free_thread_info(struct thread_info *);
87
88BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
89#define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)
90 87
91#endif /* __ASSEMBLY__ */ 88#endif /* __ASSEMBLY__ */
92 89
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index a948ee52e268..2663b92b9ece 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -650,7 +650,7 @@ static void srmmu_unmapiorange(unsigned long virt_addr, unsigned int len)
650 * mappings on the kernel stack without any special code as we did 650 * mappings on the kernel stack without any special code as we did
651 * need on the sun4c. 651 * need on the sun4c.
652 */ 652 */
653static struct thread_info *srmmu_alloc_thread_info_node(int node) 653struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
654{ 654{
655 struct thread_info *ret; 655 struct thread_info *ret;
656 656
@@ -664,7 +664,7 @@ static struct thread_info *srmmu_alloc_thread_info_node(int node)
664 return ret; 664 return ret;
665} 665}
666 666
667static void srmmu_free_thread_info(struct thread_info *ti) 667void free_thread_info(struct thread_info *ti)
668{ 668{
669 free_pages((unsigned long)ti, THREAD_INFO_ORDER); 669 free_pages((unsigned long)ti, THREAD_INFO_ORDER);
670} 670}
@@ -2250,9 +2250,6 @@ void __init ld_mmu_srmmu(void)
2250 2250
2251 BTFIXUPSET_CALL(mmu_info, srmmu_mmu_info, BTFIXUPCALL_NORM); 2251 BTFIXUPSET_CALL(mmu_info, srmmu_mmu_info, BTFIXUPCALL_NORM);
2252 2252
2253 BTFIXUPSET_CALL(alloc_thread_info_node, srmmu_alloc_thread_info_node, BTFIXUPCALL_NORM);
2254 BTFIXUPSET_CALL(free_thread_info, srmmu_free_thread_info, BTFIXUPCALL_NORM);
2255
2256 BTFIXUPSET_CALL(pte_to_pgoff, srmmu_pte_to_pgoff, BTFIXUPCALL_NORM); 2253 BTFIXUPSET_CALL(pte_to_pgoff, srmmu_pte_to_pgoff, BTFIXUPCALL_NORM);
2257 BTFIXUPSET_CALL(pgoff_to_pte, srmmu_pgoff_to_pte, BTFIXUPCALL_NORM); 2254 BTFIXUPSET_CALL(pgoff_to_pte, srmmu_pgoff_to_pte, BTFIXUPCALL_NORM);
2258 2255