linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Santosh Shilimkar <santosh.shilimkar@ti.com>
Subject: linux-next: manual merge of the arm tree with the arm-current tree
Date: Mon, 27 Sep 2010 14:21:22 +1000	[thread overview]
Message-ID: <20100927142122.ede9cf9d.sfr@canb.auug.org.au> (raw)

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mm/mmu.c between commit f1a2481c0ad3aebd94d11b317c488deaadc25002
("ARM: 6407/1: mmu: Setup MT_MEMORY and MT_MEMORY_NONCACHED L1 entries")
from the arm-current tree and commit
dc966984f44f16b8bb6b0644e501c7c2163ead69 ("ARM: Allow SMP kernels to boot
on UP systems") from the arm tree.

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/arm/mm/mmu.c
index 6a3a2d0,a789320..0000000
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -436,22 -423,21 +433,23 @@@ static void __init build_mem_type_table
  		mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
  		mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
  
- #ifdef CONFIG_SMP
- 		/*
- 		 * Mark memory with the "shared" attribute for SMP systems
- 		 */
- 		user_pgprot |= L_PTE_SHARED;
- 		kern_pgprot |= L_PTE_SHARED;
- 		vecs_pgprot |= L_PTE_SHARED;
- 		mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S;
- 		mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
- 		mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
- 		mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
- 		mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
- 		mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
- 		mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
- 		mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
- #endif
+ 		if (is_smp()) {
+ 			/*
+ 			 * Mark memory with the "shared" attribute
+ 			 * for SMP systems
+ 			 */
+ 			user_pgprot |= L_PTE_SHARED;
+ 			kern_pgprot |= L_PTE_SHARED;
+ 			vecs_pgprot |= L_PTE_SHARED;
+ 			mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S;
+ 			mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
+ 			mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
+ 			mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
+ 			mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
++			mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
+ 			mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
++			mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
+ 		}
  	}
  
  	/*

             reply	other threads:[~2010-09-27  4:21 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-27  4:21 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28   ` Dave Martin
2010-12-15 16:43     ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 23:33 Stephen Rothwell
2010-10-12  8:03 ` Uwe Kleine-König
2010-10-12  8:28   ` Russell King
2010-10-12  9:23     ` Uwe Kleine-König
2010-10-12  9:42       ` Russell King
2010-10-12 10:02         ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
2010-10-11  1:24 Stephen Rothwell
2010-10-11  7:48 ` Anders Larsen
2010-07-26  1:13 Stephen Rothwell
2010-02-02  0:07 Stephen Rothwell
2010-01-17 23:35 Stephen Rothwell
2010-01-18  1:33 ` Ben Dooks
2010-01-18  3:34   ` Stephen Rothwell
2009-05-06  1:32 Stephen Rothwell
2009-03-23  0:06 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16  0:18 ` Ryan Mallon
2009-02-16  0:29   ` Russell King

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=20100927142122.ede9cf9d.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    --cc=santosh.shilimkar@ti.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).