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

Commit fd11e153 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Add alignment flag to PCI expansion resources
  sparc: Avoid calling sigprocmask()
  sparc: Use set_current_blocked()
  sparc32,leon: SRMMU MMU Table probe fix
parents 505f48b5 aad45644

arch/sparc/include/asm/pgtsrmmu.h

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr) 
	return retval;

}

#else

#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK)

#define srmmu_hwprobe(addr) srmmu_swprobe(addr, 0)

#endif



static inline int

arch/sparc/kernel/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ static void pci_parse_of_addrs(struct platform_device *op, 
			res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2];

		} else if (i == dev->rom_base_reg) {

			res = &dev->resource[PCI_ROM_RESOURCE];

			flags |= IORESOURCE_READONLY | IORESOURCE_CACHEABLE;

			flags |= IORESOURCE_READONLY | IORESOURCE_CACHEABLE

			      | IORESOURCE_SIZEALIGN;

		} else {

			printk(KERN_ERR "PCI: bad cfg reg num 0x%x\n", i);

			continue;

arch/sparc/kernel/signal32.c

+7 −14
Original line number Diff line number Diff line
@@ -273,10 +273,7 @@ void do_sigreturn32(struct pt_regs *regs) 
		case 1: set.sig[0] = seta[0] + (((long)seta[1]) << 32);

	}

	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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

	set_current_blocked(&set);

	return;



segv:
@@ -377,10 +374,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs) 
		case 1: set.sig[0] = seta.sig[0] + (((long)seta.sig[1]) << 32);

	}

	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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

	set_current_blocked(&set);

	return;

segv:

	force_sig(SIGSEGV, current);
@@ -782,6 +776,7 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka, 
				  siginfo_t *info,

				  sigset_t *oldset, struct pt_regs *regs)

{

	sigset_t blocked;

	int err;



	if (ka->sa.sa_flags & SA_SIGINFO)
@@ -792,12 +787,10 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka, 
	if (err)

		return err;



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

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

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

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

		sigaddset(&current->blocked,signr);

	recalc_sigpending();

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

		sigaddset(&blocked, signr);

	set_current_blocked(&blocked);



	tracehook_signal_handler(signr, info, ka, regs, 0);
@@ -881,7 +874,7 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, 
	 */

	if (current_thread_info()->status & TS_RESTORE_SIGMASK) {

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

		set_current_blocked(&current->saved_sigmask);

	}

}

arch/sparc/kernel/signal_32.c

+13 −19
Original line number Diff line number Diff line
@@ -62,12 +62,13 @@ struct rt_signal_frame { 


static int _sigpause_common(old_sigset_t set)

{

	set &= _BLOCKABLE;

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

	sigset_t blocked;



	current->saved_sigmask = current->blocked;

	siginitset(&current->blocked, set);

	recalc_sigpending();

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



	set &= _BLOCKABLE;

	siginitset(&blocked, set);

	set_current_blocked(&blocked);



	current->state = TASK_INTERRUPTIBLE;

	schedule();
@@ -139,10 +140,7 @@ asmlinkage void do_sigreturn(struct pt_regs *regs) 
		goto segv_and_exit;



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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

	set_current_blocked(&set);

	return;



segv_and_exit:
@@ -209,10 +207,7 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs) 
	}



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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

	set_current_blocked(&set);

	return;

segv:

	force_sig(SIGSEGV, current);
@@ -470,6 +465,7 @@ static inline int 
handle_signal(unsigned long signr, struct k_sigaction *ka,

	      siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)

{

	sigset_t blocked;

	int err;



	if (ka->sa.sa_flags & SA_SIGINFO)
@@ -480,12 +476,10 @@ handle_signal(unsigned long signr, struct k_sigaction *ka, 
	if (err)

		return err;



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

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

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

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

		sigaddset(&current->blocked, signr);

	recalc_sigpending();

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

		sigaddset(&blocked, signr);

	set_current_blocked(&blocked);



	tracehook_signal_handler(signr, info, ka, regs, 0);
@@ -581,7 +575,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
	 */

	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {

		clear_thread_flag(TIF_RESTORE_SIGMASK);

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

		set_current_blocked(&current->saved_sigmask);

	}

}

arch/sparc/kernel/signal_64.c

+13 −19
Original line number Diff line number Diff line
@@ -70,10 +70,7 @@ asmlinkage void sparc64_set_context(struct pt_regs *regs) 
				goto do_sigsegv;

		}

		sigdelsetmask(&set, ~_BLOCKABLE);

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

		current->blocked = set;

		recalc_sigpending();

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

		set_current_blocked(&set);

	}

	if (test_thread_flag(TIF_32BIT)) {

		pc &= 0xffffffff;
@@ -242,12 +239,13 @@ struct rt_signal_frame { 


static long _sigpause_common(old_sigset_t set)

{

	set &= _BLOCKABLE;

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

	sigset_t blocked;



	current->saved_sigmask = current->blocked;

	siginitset(&current->blocked, set);

	recalc_sigpending();

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



	set &= _BLOCKABLE;

	siginitset(&blocked, set);

	set_current_blocked(&blocked);



	current->state = TASK_INTERRUPTIBLE;

	schedule();
@@ -327,10 +325,7 @@ void do_rt_sigreturn(struct pt_regs *regs) 
	pt_regs_clear_syscall(regs);



	sigdelsetmask(&set, ~_BLOCKABLE);

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

	current->blocked = set;

	recalc_sigpending();

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

	set_current_blocked(&set);

	return;

segv:

	force_sig(SIGSEGV, current);
@@ -484,18 +479,17 @@ static inline int handle_signal(unsigned long signr, struct k_sigaction *ka, 
				siginfo_t *info,

				sigset_t *oldset, struct pt_regs *regs)

{

	sigset_t blocked;

	int err;



	err = setup_rt_frame(ka, regs, signr, oldset,

			     (ka->sa.sa_flags & SA_SIGINFO) ? info : NULL);

	if (err)

		return err;

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

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

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

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

		sigaddset(&current->blocked,signr);

	recalc_sigpending();

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

		sigaddset(&blocked, signr);

	set_current_blocked(&blocked);



	tracehook_signal_handler(signr, info, ka, regs, 0);
@@ -601,7 +595,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
	 */

	if (current_thread_info()->status & TS_RESTORE_SIGMASK) {

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

		set_current_blocked(&current->saved_sigmask);

	}

}