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

Commit 69539ab1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull arch/tile update from Chris Metcalf
 "These include a couple of queued-up minor bug fixes from the
  community, a fix to unbreak the sysfs hooks in tile, and syncing up
  the defconfigs."

Ugh.  defconfigs updates without "make minconfig".  Tons of ugly
pointless lines there, I suspect.

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: Use set_current_blocked() and block_sigmask()
  arch/tile: misplaced parens near likely
  arch/tile: sync up the defconfig files to the tip
  arch/tile: Fix up from commit 8a25a2fd
parents 0a49aeca ad092338

arch/tile/configs/tilegx_defconfig

+396 −204

File changed.

Preview size limit exceeded, changes collapsed.

arch/tile/configs/tilepro_defconfig

+1087 −355

File changed.

Preview size limit exceeded, changes collapsed.

arch/tile/kernel/compat_signal.c

+1 −4
Original line number Diff line number Diff line
@@ -303,10 +303,7 @@ long compat_sys_rt_sigreturn(struct pt_regs *regs) 
		goto badframe;



	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 (restore_sigcontext(regs, &frame->uc.uc_mcontext))

		goto badframe;

arch/tile/kernel/signal.c

+2 −11
Original line number Diff line number Diff line
@@ -97,10 +97,7 @@ SYSCALL_DEFINE1(rt_sigreturn, struct pt_regs *, regs) 
		goto badframe;



	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 (restore_sigcontext(regs, &frame->uc.uc_mcontext))

		goto badframe;
@@ -286,13 +283,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info, 
		 * the work_pending path in the return-to-user code, and

		 * either way we can re-enable interrupts unconditionally.

		 */

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

		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);

		block_sigmask(ka, sig);

	}



	return ret;

arch/tile/kernel/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int __init create_sysfs_entries(void) 


#define create_hv_attr(name)						\

	if (!err)							\

		err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name);

		err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name.attr);

	create_hv_attr(type);

	create_hv_attr(version);

	create_hv_attr(config_version);