summaryrefslogtreecommitdiffstats
path: root/arch/sparc/ap1000
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/ap1000')
-rw-r--r--arch/sparc/ap1000/apmmu.c34
-rw-r--r--arch/sparc/ap1000/msc.c10
-rw-r--r--arch/sparc/ap1000/sync.c2
3 files changed, 23 insertions, 23 deletions
diff --git a/arch/sparc/ap1000/apmmu.c b/arch/sparc/ap1000/apmmu.c
index e07b4f4b1..5d852f859 100644
--- a/arch/sparc/ap1000/apmmu.c
+++ b/arch/sparc/ap1000/apmmu.c
@@ -295,7 +295,7 @@ static inline unsigned long apmmu_hwprobe(unsigned long vaddr)
static inline void apmmu_uncache_page(unsigned long addr)
{
- pgd_t *pgdp = apmmu_pgd_offset(init_task.mm, addr);
+ pgd_t *pgdp = apmmu_pgd_offset(&init_mm, addr);
pmd_t *pmdp;
pte_t *ptep;
@@ -316,7 +316,7 @@ static inline void apmmu_uncache_page(unsigned long addr)
static inline void apmmu_recache_page(unsigned long addr)
{
- pgd_t *pgdp = apmmu_pgd_offset(init_task.mm, addr);
+ pgd_t *pgdp = apmmu_pgd_offset(&init_mm, addr);
pmd_t *pmdp;
pte_t *ptep;
@@ -527,7 +527,7 @@ static void apmmu_quick_kernel_fault(unsigned long address)
{
printk("Kernel faults at addr=0x%08lx\n", address);
printk("PTE=%08lx\n", apmmu_hwprobe((address & PAGE_MASK)));
- die_if_kernel("APMMU bolixed...", current->tss.kregs);
+ die_if_kernel("APMMU bolixed...", current->thread.kregs);
}
static inline void alloc_context(struct task_struct *tsk)
@@ -775,14 +775,14 @@ static inline pte_t *apmmu_early_pte_offset(pmd_t *dir, unsigned long address)
return (pte_t *) apmmu_early_pmd_page(*dir) + ((address >> PAGE_SHIFT) & (APMMU_PTRS_PER_PTE - 1));
}
-__initfunc(static inline void apmmu_allocate_ptable_skeleton(unsigned long start, unsigned long end))
+static inline void __init apmmu_allocate_ptable_skeleton(unsigned long start, unsigned long end)
{
pgd_t *pgdp;
pmd_t *pmdp;
pte_t *ptep;
while(start < end) {
- pgdp = apmmu_pgd_offset(init_task.mm, start);
+ pgdp = apmmu_pgd_offset(&init_mm, start);
if(apmmu_pgd_none(*pgdp)) {
pmdp = sparc_init_alloc(&mempool, APMMU_PMD_TABLE_SIZE);
apmmu_early_pgd_set(pgdp, pmdp);
@@ -797,14 +797,14 @@ __initfunc(static inline void apmmu_allocate_ptable_skeleton(unsigned long start
}
-__initfunc(static void make_page(unsigned virt_page, unsigned phys_page, unsigned prot))
+static void __init make_page(unsigned virt_page, unsigned phys_page, unsigned prot)
{
pgd_t *pgdp;
pmd_t *pmdp;
pte_t *ptep;
unsigned start = virt_page<<12;
- pgdp = apmmu_pgd_offset(init_task.mm, start);
+ pgdp = apmmu_pgd_offset(&init_mm, start);
if(apmmu_pgd_none(*pgdp)) {
pmdp = sparc_init_alloc(&mempool, APMMU_PMD_TABLE_SIZE);
apmmu_early_pgd_set(pgdp, pmdp);
@@ -819,17 +819,17 @@ __initfunc(static void make_page(unsigned virt_page, unsigned phys_page, unsigne
}
-__initfunc(static void make_large_page(unsigned virt_page, unsigned phys_page, unsigned prot))
+static void __init make_large_page(unsigned virt_page, unsigned phys_page, unsigned prot)
{
pgd_t *pgdp;
unsigned start = virt_page<<12;
- pgdp = apmmu_pgd_offset(init_task.mm, start);
+ pgdp = apmmu_pgd_offset(&init_mm, start);
*pgdp = __pgd((phys_page<<8) | prot);
}
-__initfunc(static void ap_setup_mappings(void))
+static void __init ap_setup_mappings(void)
{
unsigned Srwe = APMMU_PRIV | APMMU_VALID;
unsigned SrweUr = 0x14 | APMMU_VALID; /* weird! */
@@ -897,7 +897,7 @@ __initfunc(static void ap_setup_mappings(void))
make_page(MSC_REMREPLY_DIRECT_END>>PAGE_SHIFT, 0xa0c004,Srwe);
}
-__initfunc(static void map_kernel(void))
+static void __init map_kernel(void)
{
int phys;
@@ -907,7 +907,7 @@ __initfunc(static void map_kernel(void))
make_large_page((KERNBASE+phys)>>12,
(phys>>12),
APMMU_CACHE|APMMU_PRIV|APMMU_VALID);
- init_task.mm->mmap->vm_start = page_offset = KERNBASE;
+ init_mm.mmap->vm_start = page_offset = KERNBASE;
stack_top = page_offset - PAGE_SIZE;
}
@@ -917,7 +917,7 @@ extern unsigned long sparc_context_init(unsigned long, int);
extern int physmem_mapped_contig;
extern int linux_num_cpus;
-__initfunc(unsigned long apmmu_paging_init(unsigned long start_mem, unsigned long end_mem))
+unsigned long __init apmmu_paging_init(unsigned long start_mem, unsigned long end_mem)
{
int i;
@@ -979,7 +979,7 @@ static void apmmu_update_mmu_cache(struct vm_area_struct * vma, unsigned long ad
{
}
-__initfunc(static void poke_viking(void))
+static void __init poke_viking(void)
{
unsigned long mreg = apmmu_get_mmureg();
@@ -991,7 +991,7 @@ __initfunc(static void poke_viking(void))
apmmu_set_mmureg(mreg);
}
-__initfunc(static void init_viking(void))
+static void __init init_viking(void)
{
apmmu_name = "TI Viking/AP1000";
@@ -1024,7 +1024,7 @@ extern unsigned long srmmu_fault;
*iaddr = SPARC_BRANCH((unsigned long) daddr, (unsigned long) iaddr); \
} while(0);
-__initfunc(static void patch_window_trap_handlers(void))
+static void __init patch_window_trap_handlers(void)
{
unsigned long *iaddr, *daddr;
@@ -1038,7 +1038,7 @@ __initfunc(static void patch_window_trap_handlers(void))
}
/* Load up routines and constants for apmmu */
-__initfunc(void ld_mmu_apmmu(void))
+void __init ld_mmu_apmmu(void)
{
/* First the constants */
BTFIXUPSET_SIMM13(pmd_shift, APMMU_PMD_SHIFT);
diff --git a/arch/sparc/ap1000/msc.c b/arch/sparc/ap1000/msc.c
index 01337a53a..088df765c 100644
--- a/arch/sparc/ap1000/msc.c
+++ b/arch/sparc/ap1000/msc.c
@@ -17,7 +17,7 @@
#include <asm/irq.h>
#include <asm/pgtable.h>
#include <asm/ap1000/pgtapmmu.h>
-#include <linux/tasks.h>
+#include <linux/threads.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -623,8 +623,8 @@ static void fail_write(int context,int intr,unsigned vaddr)
if (vaddr - MSC_REM_SIGNAL < _NSIG*PAGE_SIZE) {
handle_signal(context,vaddr);
} else {
- task[tsk]->tss.sig_address = vaddr;
- task[tsk]->tss.sig_desc = SUBSIG_NOMAPPING;
+ task[tsk]->thread.sig_address = vaddr;
+ task[tsk]->thread.sig_desc = SUBSIG_NOMAPPING;
send_sig(SIGSEGV, task[tsk], 1);
}
}
@@ -650,8 +650,8 @@ static void fail_read(int context,int intr,unsigned vaddr)
if (vaddr - MSC_REM_SIGNAL < _NSIG*PAGE_SIZE) {
handle_signal(context,vaddr);
} else {
- task[tsk]->tss.sig_address = vaddr;
- task[tsk]->tss.sig_desc = SUBSIG_NOMAPPING;
+ task[tsk]->thread.sig_address = vaddr;
+ task[tsk]->thread.sig_desc = SUBSIG_NOMAPPING;
send_sig(SIGSEGV, task[tsk], 1);
}
}
diff --git a/arch/sparc/ap1000/sync.c b/arch/sparc/ap1000/sync.c
index 455a67173..2f8a7cd34 100644
--- a/arch/sparc/ap1000/sync.c
+++ b/arch/sparc/ap1000/sync.c
@@ -10,7 +10,7 @@
#include <asm/ap1000/apreg.h>
#include <linux/mm.h>
#include <linux/sched.h>
-#include <linux/tasks.h>
+#include <linux/threads.h>
extern int cap_cid0;
extern unsigned _ncel, _ncelx, _ncely, _cid;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:47:44 +0000