diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 15:17:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 15:17:25 +0900 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /arch/sparc/mm/srmmu.c | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
| download | talos-obmc-linux-a3d3362287fbe96fe90abdb5c6d1a35471129a8c.tar.gz talos-obmc-linux-a3d3362287fbe96fe90abdb5c6d1a35471129a8c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/sparc/mm/srmmu.c')
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 92319aa8b662..fe09fd8be695 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) * mappings on the kernel stack without any special code as we did * need on the sun4c. */ -static struct thread_info *srmmu_alloc_thread_info(void) +static struct thread_info *srmmu_alloc_thread_info_node(int node) { struct thread_info *ret; @@ -2271,7 +2271,7 @@ void __init ld_mmu_srmmu(void) BTFIXUPSET_CALL(mmu_info, srmmu_mmu_info, BTFIXUPCALL_NORM); - BTFIXUPSET_CALL(alloc_thread_info, srmmu_alloc_thread_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); |
