On Thu, Aug 23, 2012 at 01:01:43PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in arch/Kconfig
> between commit b952741c8079 ("cputime: Generalize
> CONFIG_VIRT_CPU_ACCOUNTING") from the tip tree and commit 3dbdfc26e27f
> ("rcu: Settle config for userspace extended quiescent state") from the
> rcu tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good, thank you!
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/Kconfig
> index 07db929,1c7c9be..0000000
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@@ -294,26 -274,14 +294,36 @@@ config SECCOMP_FILTE
>
> See Documentation/prctl/seccomp_filter.txt for details.
>
> +config HAVE_MOD_ARCH_SPECIFIC
> + bool
> + help
> + The arch uses struct mod_arch_specific to store data. Many arches
> + just need a simple module loader without arch specific data - those
> + should not enable this.
> +
> +config MODULES_USE_ELF_RELA
> + bool
> + help
> + Modules only use ELF RELA relocations. Modules with ELF REL
> + relocations will give an error.
> +
> +config MODULES_USE_ELF_REL
> + bool
> + help
> + Modules only use ELF REL relocations. Modules with ELF RELA
> + relocations will give an error.
> +
> +config HAVE_VIRT_CPU_ACCOUNTING
> + bool
> +
> + config HAVE_RCU_USER_QS
> + bool
> + help
> + Provide kernel entry/exit hooks necessary for userspace
> + RCU extended quiescent state. Syscalls need to be wrapped inside
> + rcu_user_exit()-rcu_user_enter() through the slow path using
> + TIF_NOHZ flag. Exceptions handlers must be wrapped as well. Irqs
> + are already protected inside rcu_irq_enter/rcu_irq_exit() but
> + preemption or signal handling on irq exit still need to be protected.
> +
> source "kernel/gcov/Kconfig"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
