From: Mark Brown <broonie@kernel.org>
To: Heiko Stuebner <heiko@sntech.de>, Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the rockchip tree with the tree
Date: Wed, 2 Dec 2015 11:34:25 +0000 [thread overview]
Message-ID: <20151202113425.f22805556b3009b7b9bfa351@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
Hi Heiko,
Today's linux-next merge of the rockchip tree got a conflict in
arch/arm/mach-rockchip/platsmp.c between commit 75305275a721d33ae9abf ("ARM:
use const and __initconst for smp_operations") from the arm-soc tree and commit
9def7ccfe8d5b84 ("ARM: rockchip: add support smp for rk3036") from the rockchip
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/arm/mach-rockchip/platsmp.c
index 938888fc55a1,5c138f9699f9..000000000000
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@@ -340,7 -351,16 +351,16 @@@ static void rockchip_cpu_die(unsigned i
}
#endif
-static struct smp_operations rk3036_smp_ops __initdata = {
++static const struct smp_operations rk3036_smp_ops __initdata = {
+ .smp_prepare_cpus = rk3036_smp_prepare_cpus,
+ .smp_boot_secondary = rockchip_boot_secondary,
+ #ifdef CONFIG_HOTPLUG_CPU
+ .cpu_kill = rockchip_cpu_kill,
+ .cpu_die = rockchip_cpu_die,
+ #endif
+ };
+
-static struct smp_operations rockchip_smp_ops __initdata = {
+static const struct smp_operations rockchip_smp_ops __initconst = {
.smp_prepare_cpus = rockchip_smp_prepare_cpus,
.smp_boot_secondary = rockchip_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
reply other threads:[~2015-12-02 11:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151202113425.f22805556b3009b7b9bfa351@kernel.org \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=heiko@sntech.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).