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

Commit 208d5017 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:
 "misc fixes some of which are also applicable to 3.3 and removal of an
  unused function.  This has been sitting in -next for ages with no
  complaints.  Also there are no known regressions due to these patches"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Remove get_current_pgd().
  MIPS: ath79: fix AR933X WMAC reset code
  MIPS: JZ4740: Fix the JZ4740_IRQ_DMA macro
  MIPS: Use set_current_blocked() and block_sigmask()
parents 655861e3 dc5efaa0

arch/mips/ath79/dev-wmac.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,8 +58,8 @@ static void __init ar913x_wmac_setup(void) 




static int ar933x_wmac_reset(void)

static int ar933x_wmac_reset(void)

{

{

	ath79_device_reset_clear(AR933X_RESET_WMAC);

	ath79_device_reset_set(AR933X_RESET_WMAC);

	ath79_device_reset_set(AR933X_RESET_WMAC);

	ath79_device_reset_clear(AR933X_RESET_WMAC);





	return 0;

	return 0;

}

}

arch/mips/include/asm/mach-jz4740/irq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 
#define JZ4740_IRQ_LCD		JZ4740_IRQ(30)

#define JZ4740_IRQ_LCD		JZ4740_IRQ(30)





/* 2nd-level interrupts */

/* 2nd-level interrupts */

#define JZ4740_IRQ_DMA(x)	(JZ4740_IRQ(32) + (X))

#define JZ4740_IRQ_DMA(x)	(JZ4740_IRQ(32) + (x))





#define JZ4740_IRQ_INTC_GPIO(x) (JZ4740_IRQ_GPIO0 - (x))

#define JZ4740_IRQ_INTC_GPIO(x) (JZ4740_IRQ_GPIO0 - (x))

#define JZ4740_IRQ_GPIO(x)	(JZ4740_IRQ(48) + (x))

#define JZ4740_IRQ_GPIO(x)	(JZ4740_IRQ(48) + (x))

arch/mips/include/asm/mmu_context.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -37,12 +37,6 @@ extern void tlbmiss_handler_setup_pgd(unsigned long pgd); 
		write_c0_xcontext((unsigned long) smp_processor_id() << 51); \

		write_c0_xcontext((unsigned long) smp_processor_id() << 51); \

	} while (0)

	} while (0)







static inline unsigned long get_current_pgd(void)

{

	return PHYS_TO_XKSEG_CACHED((read_c0_context() >> 11) & ~0xfffUL);

}



#else /* CONFIG_MIPS_PGD_C0_CONTEXT: using  pgd_current*/

#else /* CONFIG_MIPS_PGD_C0_CONTEXT: using  pgd_current*/





/*

/*

arch/mips/kernel/signal.c

+5 −22
Original line number Original line Diff line number Diff line
@@ -257,11 +257,8 @@ asmlinkage int sys_sigsuspend(nabi_no_regargs struct pt_regs regs) 
		return -EFAULT;

		return -EFAULT;

	sigdelsetmask(&newset, ~_BLOCKABLE);

	sigdelsetmask(&newset, ~_BLOCKABLE);





	spin_lock_irq(&current->sighand->siglock);

	current->saved_sigmask = current->blocked;

	current->saved_sigmask = current->blocked;

	current->blocked = newset;

	set_current_blocked(&newset);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	current->state = TASK_INTERRUPTIBLE;

	current->state = TASK_INTERRUPTIBLE;

	schedule();

	schedule();
@@ -286,11 +283,8 @@ asmlinkage int sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) 
		return -EFAULT;

		return -EFAULT;

	sigdelsetmask(&newset, ~_BLOCKABLE);

	sigdelsetmask(&newset, ~_BLOCKABLE);





	spin_lock_irq(&current->sighand->siglock);

	current->saved_sigmask = current->blocked;

	current->saved_sigmask = current->blocked;

	current->blocked = newset;

	set_current_blocked(&newset);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	current->state = TASK_INTERRUPTIBLE;

	current->state = TASK_INTERRUPTIBLE;

	schedule();

	schedule();
@@ -362,10 +356,7 @@ asmlinkage void sys_sigreturn(nabi_no_regargs struct pt_regs regs) 
		goto badframe;

		goto badframe;





	sigdelsetmask(&blocked, ~_BLOCKABLE);

	sigdelsetmask(&blocked, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(&blocked);

	current->blocked = blocked;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	sig = restore_sigcontext(&regs, &frame->sf_sc);

	sig = restore_sigcontext(&regs, &frame->sf_sc);

	if (sig < 0)

	if (sig < 0)
@@ -401,10 +392,7 @@ asmlinkage void sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs) 
		goto badframe;

		goto badframe;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(&set);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	sig = restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext);

	sig = restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext);

	if (sig < 0)

	if (sig < 0)
@@ -580,12 +568,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	spin_lock_irq(&current->sighand->siglock);

	block_sigmask(ka, sig);

	sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);

	if (!(ka->sa.sa_flags & SA_NODEFER))

		sigaddset(&current->blocked, sig);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	return ret;

	return ret;

}

}

arch/mips/kernel/signal32.c

+4 −16
Original line number Original line Diff line number Diff line
@@ -290,11 +290,8 @@ asmlinkage int sys32_sigsuspend(nabi_no_regargs struct pt_regs regs) 
		return -EFAULT;

		return -EFAULT;

	sigdelsetmask(&newset, ~_BLOCKABLE);

	sigdelsetmask(&newset, ~_BLOCKABLE);





	spin_lock_irq(&current->sighand->siglock);

	current->saved_sigmask = current->blocked;

	current->saved_sigmask = current->blocked;

	current->blocked = newset;

	set_current_blocked(&newset);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	current->state = TASK_INTERRUPTIBLE;

	current->state = TASK_INTERRUPTIBLE;

	schedule();

	schedule();
@@ -318,11 +315,8 @@ asmlinkage int sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) 
		return -EFAULT;

		return -EFAULT;

	sigdelsetmask(&newset, ~_BLOCKABLE);

	sigdelsetmask(&newset, ~_BLOCKABLE);





	spin_lock_irq(&current->sighand->siglock);

	current->saved_sigmask = current->blocked;

	current->saved_sigmask = current->blocked;

	current->blocked = newset;

	set_current_blocked(&newset);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	current->state = TASK_INTERRUPTIBLE;

	current->state = TASK_INTERRUPTIBLE;

	schedule();

	schedule();
@@ -488,10 +482,7 @@ asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs) 
		goto badframe;

		goto badframe;





	sigdelsetmask(&blocked, ~_BLOCKABLE);

	sigdelsetmask(&blocked, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(&blocked);

	current->blocked = blocked;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	sig = restore_sigcontext32(&regs, &frame->sf_sc);

	sig = restore_sigcontext32(&regs, &frame->sf_sc);

	if (sig < 0)

	if (sig < 0)
@@ -529,10 +520,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) 
		goto badframe;

		goto badframe;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(&set);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	sig = restore_sigcontext32(&regs, &frame->rs_uc.uc_mcontext);

	sig = restore_sigcontext32(&regs, &frame->rs_uc.uc_mcontext);

	if (sig < 0)

	if (sig < 0)