Re: linux-next: manual merge of the tip tree with the rr tree
On Fri, Sep 28, 2012 at 01:33:41PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
> between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use
> asm-generic/module.h") from the rr tree and commits fdf9c356502a
> ("cputime: Make finegrained irqtime accounting generally available") and
> 2b1d5024e17b ("rcu: Settle config for userspace extended quiescent
> state") from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the tip tree with the rr tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit 9a9d5786a5e7 ("Make most arch
asm/module.h files use asm-generic/module.h") from the rr tree and
commits fdf9c356502a ("cputime: Make finegrained irqtime accounting
generally available") and edf55fda35c7 ("x86: Exit RCU extended QS on
notify resume") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/Kconfig
index ede3e92,56e7a25..000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -97,11 -102,12 +102,14 @@@ config X8
select KTIME_SCALAR if X86_32
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
+ select MODULES_USE_ELF_REL if X86_32
+ select MODULES_USE_ELF_RELA if X86_64
+ select HAVE_RCU_USER_QS if X86_64
+ select HAVE_IRQ_TIME_ACCOUNTING
config INSTRUCTION_DECODER
- def_bool (KPROBES || PERF_EVENTS || UPROBES)
+ def_bool y
+ depends on KPROBES || PERF_EVENTS || UPROBES
config OUTPUT_FORMAT
string
pgpGnASZxIIxz.pgp
Description: PGP signature
linux-next: manual merge of the tip tree with the rr tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree and commits fdf9c356502a
("cputime: Make finegrained irqtime accounting generally available") and
2b1d5024e17b ("rcu: Settle config for userspace extended quiescent
state") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/Kconfig
index 3450115,a62965d..000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,23 +294,42 @@@ 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_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.
+
+ config HAVE_VIRT_CPU_ACCOUNTING
+ bool
+
+ config HAVE_IRQ_TIME_ACCOUNTING
+ bool
+ help
+ Archs need to ensure they use a high enough resolution clock to
+ support irq time accounting and then call
enable_sched_clock_irqtime().
+
source "kernel/gcov/Kconfig"
pgp85LjNPxyYd.pgp
Description: PGP signature
Re: linux-next: manual merge of the tip tree with the rr tree
On Thu, Aug 23, 2012 at 12:43:48PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
> between commit bd029f48459a ("Make most arch asm/module.h files use
> asm-generic/module.h") from the rr tree and commit b952741c8079
> ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
Looks good, thanks!
>
> diff --cc arch/Kconfig
> index 3450115,ea5feb6..000
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@@ -281,23 -294,7 +294,26 @@@ 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
> +
> source "kernel/gcov/Kconfig"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the tip tree with the rr tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
between commit bd029f48459a ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree and commit b952741c8079
("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") from the tip tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/Kconfig
index 3450115,ea5feb6..000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,7 +294,26 @@@ 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
+
source "kernel/gcov/Kconfig"
pgp3T6DDsZ0Wv.pgp
Description: PGP signature
