From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Sep 2009 00:48:14 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.32-rc1~691
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'devel' of /home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
  [ARM] Update mach-types
  ARM: 5636/1: Move vendor enum to AMBA include
  ARM: Fix pfn_valid() for sparse memory
  [ARM] orion5x: Add LaCie NAS 2Big Network support
  [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
  ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
  ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
  ARM: 5689/1: Update default config of HP Jornada 700-series machines
  ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
  ARM: 5688/1: ks8695_serial: disable_irq() lockup
  ARM: 5687/1: fix an oops with highmem
  ARM: 5684/1: Add nuc960 platform to w90x900
  ARM: 5683/1: Add nuc950 platform to w90x900
  ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
  ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
  ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
  MMC: MMCI: convert realview MMC to use gpiolib
  ARM: 5685/1: Make MMCI driver compile without gpiolib
  ARM: implement highpte
  ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
  ...

Fix up trivial conflict in arch/arm/kernel/signal.c.

It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
---

2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac
diff --cc arch/arm/kernel/signal.c
index b76fe06,f7194e4..1423a34
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@@ -707,12 -694,5 +695,12 @@@ asmlinkage voi
  do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
  {
  	if (thread_flags & _TIF_SIGPENDING)
- 		do_signal(&current->blocked, regs, syscall);
+ 		do_signal(regs, syscall);
 +
 +	if (thread_flags & _TIF_NOTIFY_RESUME) {
 +		clear_thread_flag(TIF_NOTIFY_RESUME);
 +		tracehook_notify_resume(regs);
 +		if (current->replacement_session_keyring)
 +			key_replace_session_keyring();
 +	}
  }