ARM context switch changes for -next

Hi Stephen,

Could you please pull the branch below into -next? I'd like to give it a few weeks of exposure before sending an official pull request to Russell. One of the patches introduces a scheduler hook and Peter Z agreed with it. You may get a conflict in -next since some scheduler files have been renamed.

Thanks.

The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339:

Linux 3.2-rc6 (2011-12-16 18:36:26 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git intr-ctxsw

Catalin Marinas (4):
sched: Introduce the finish_arch_post_lock_switch() scheduler hook
ARM: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW on ASID-capable CPUs
ARM: Remove current_mm per-cpu variable
ARM: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW on pre-ARMv6 CPUs

Will Deacon (2):
ARM: Use TTBR1 instead of reserved context ID
ARM: Allow ASID 0 to be allocated to tasks

 arch/arm/include/asm/mmu_context.h |  104 +++++++++++++++++++++++++++---------
 arch/arm/include/asm/system.h      |    7 ---
 arch/arm/include/asm/thread_info.h |    1 +
 arch/arm/mm/context.c              |   40 ++++++--------
 arch/arm/mm/proc-v7.S              |    9 +---
 kernel/sched.c                     |    4 ++
 6 files changed, 104 insertions(+), 61 deletions(-)

Catalin

Hi Catalin,

Do you expect this to be merged by Linus during the 3.3 merge window? If so, it s a bit late (I expect Linus to do the 3.2 release any time). If not, I would like not to add it to -next until after v3.3-rc1 is released so that it doesn't complicate things for the merge window.

Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

Hi Stephen,

These patches are aimed for 3.4, not the upcoming merging window.

I'll ping you again after 3.3-rc1.

Thanks.

Catalin