linux-next: manual merge of the blackfin tree with Linus' tree

linux-next: manual merge of the blackfin tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Hi all,

Today's linux-next merge of the blackfin tree got a conflict in
arch/blackfin/mach-common/smp.c between commit a17b4b7487eb ("blackfin:
Use common outgoing-CPU-notification code") from Linus' tree and commit
ca2b83264d99 ("blackfin: make timeout HZ independent") from the
blackfin tree.

I fixed it up (the former supercedes the latter, I think) and can carry
the fix as necessary (no action is required).

P.S. Steven, you committed that blackfin tree patch, but did not add you
Signed-off-by ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the blackfin tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

Hi Mike,

On Wed, 16 Sep 2009 21:34:15 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> ive pulled down the latest mainline and rebased my branch onto it.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the blackfin tree with Linus' tree

[Mike Frysinger]

On Wed, Sep 16, 2009 at 21:26, Stephen Rothwell wrote:
> 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.

ive pulled down the latest mainline and rebased my branch onto it.
thanks for the heads up.
-mike

linux-next: manual merge of the blackfin tree with Linus' tree

[Stephen Rothwell]

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