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

Commit 0197e41c authored by Pavel Tatashin's avatar Pavel Tatashin Committed by David S. Miller
Browse files

sparc64: delete old wrap code 



The old method that is using xcall and softint to get new context id is
deleted, as it is replaced by a method of using per_cpu_secondary_mm
without xcall to perform the context wrap.

Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: default avatarBob Picco <bob.picco@oracle.com>
Reviewed-by: default avatarSteven Sistare <steven.sistare@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0582f26

arch/sparc/include/asm/mmu_context_64.h

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ extern unsigned long mmu_context_bmap[]; 


DECLARE_PER_CPU(struct mm_struct *, per_cpu_secondary_mm);

void get_new_mmu_context(struct mm_struct *mm);

#ifdef CONFIG_SMP

void smp_new_mmu_context_version(void);

#else

#define smp_new_mmu_context_version() do { } while (0)

#endif



int init_new_context(struct task_struct *tsk, struct mm_struct *mm);

void destroy_context(struct mm_struct *mm);

arch/sparc/include/asm/pil.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define PIL_SMP_CALL_FUNC	1

#define PIL_SMP_RECEIVE_SIGNAL	2

#define PIL_SMP_CAPTURE		3

#define PIL_SMP_CTX_NEW_VERSION	4

#define PIL_DEVICE_IRQ		5

#define PIL_SMP_CALL_FUNC_SNGL	6

#define PIL_DEFERRED_PCR_WORK	7

arch/sparc/kernel/kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr 
/* smp_64.c */

void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs);

void __irq_entry smp_call_function_single_client(int irq, struct pt_regs *regs);

void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs);

void __irq_entry smp_penguin_jailcell(int irq, struct pt_regs *regs);

void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs);

arch/sparc/kernel/smp_64.c

+0 −31
Original line number Diff line number Diff line
@@ -964,37 +964,6 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page) 
	preempt_enable();

}



void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)

{

	struct mm_struct *mm;

	unsigned long flags;



	clear_softint(1 << irq);



	/* See if we need to allocate a new TLB context because

	 * the version of the one we are using is now out of date.

	 */

	mm = current->active_mm;

	if (unlikely(!mm || (mm == &init_mm)))

		return;



	spin_lock_irqsave(&mm->context.lock, flags);



	if (unlikely(!CTX_VALID(mm->context)))

		get_new_mmu_context(mm);



	spin_unlock_irqrestore(&mm->context.lock, flags);



	load_secondary_context(mm);

	__flush_tlb_mm(CTX_HWBITS(mm->context),

		       SECONDARY_CONTEXT);

}



void smp_new_mmu_context_version(void)

{

	smp_cross_call(&xcall_new_mmu_context_version, 0, 0, 0);

}



#ifdef CONFIG_KGDB

void kgdb_roundup_cpus(unsigned long flags)

{

arch/sparc/kernel/ttable_64.S

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ tl0_resv03e: BTRAP(0x3e) BTRAP(0x3f) BTRAP(0x40) 
tl0_irq1:	TRAP_IRQ(smp_call_function_client, 1)

tl0_irq2:	TRAP_IRQ(smp_receive_signal_client, 2)

tl0_irq3:	TRAP_IRQ(smp_penguin_jailcell, 3)

tl0_irq4:	TRAP_IRQ(smp_new_mmu_context_version_client, 4)

tl0_irq4:       BTRAP(0x44)

#else

tl0_irq1:	BTRAP(0x41)

tl0_irq2:	BTRAP(0x42)