From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Frysinger <vapier.adi@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: linux-next: manual merge of the blackfin tree with Linus' tree
Date: Thu, 17 Sep 2009 11:26:04 +1000 [thread overview]
Message-ID: <20090917112604.acbae122.sfr@canb.auug.org.au> (raw)
Hi Mike,
Today's linux-next merge of the blackfin tree got a conflict in
arch/blackfin/mm/sram-alloc.c between commit
b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
DEFINE_PER_CPU_SHARED_ALIGNED()") from Linus' tree and commit
40bf94d6d1158fb6d6d67a666e6b16ab6ac3986e ("Blackfin: push SRAM locks down
into related ifdefs") from the blackfin tree.
The latter moved the code that the former modified. I fixed it up (see
below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/blackfin/mm/sram-alloc.c
index 99e4dbb,e095094..0000000
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@@ -55,6 -50,7 +50,7 @@@ struct sram_piece
struct sram_piece *next;
};
-static DEFINE_PER_CPU(spinlock_t, l1sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1sram_lock);
static DEFINE_PER_CPU(struct sram_piece, free_l1_ssram_head);
static DEFINE_PER_CPU(struct sram_piece, used_l1_ssram_head);
@@@ -68,7 -64,12 +64,12 @@@ static DEFINE_PER_CPU(struct sram_piece
static DEFINE_PER_CPU(struct sram_piece, used_l1_data_B_sram_head);
#endif
+ #if L1_DATA_A_LENGTH || L1_DATA_B_LENGTH
-static DEFINE_PER_CPU(spinlock_t, l1_data_sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_data_sram_lock);
+ #endif
+
#if L1_CODE_LENGTH != 0
-static DEFINE_PER_CPU(spinlock_t, l1_inst_sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_inst_sram_lock);
static DEFINE_PER_CPU(struct sram_piece, free_l1_inst_sram_head);
static DEFINE_PER_CPU(struct sram_piece, used_l1_inst_sram_head);
#endif
next reply other threads:[~2009-09-17 1:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-17 1:26 Stephen Rothwell [this message]
2009-09-17 1:34 ` linux-next: manual merge of the blackfin tree with Linus' tree Mike Frysinger
2009-09-17 2:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-04-24 0:16 Stephen Rothwell
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=20090917112604.acbae122.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
--cc=vapier.adi@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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