linux-kernel - linux-next: manual merge of the at91 tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 22 Nov 2011 12:22:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the at91 tree with the arm tree

Hi all,

Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/setup.c between commit cf48c02e3bf0 ("ARM: mach-at91:
remove arch specific special handling for ioremap") from the arm tree and
commit 6a5f01336ed8 ("ARM: at91: make DBGU soc independent") from the
at91 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-at91/setup.c
index cf98a8f,3c309dc..0000000
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -73,9 -75,24 +75,6 @@@ static struct map_desc at91_io_desc __i
  	.type		= MT_DEVICE,
  };
  
- #define AT91_DBGU0	0xfffff200
- #define AT91_DBGU1	0xffffee00
- 
 -void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
 -{
 -	if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
 -		return (void __iomem *)AT91_IO_P2V(p);
 -
 -	return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
 -}
 -EXPORT_SYMBOL(at91_ioremap);
 -
 -void at91_iounmap(volatile void __iomem *addr)
 -{
 -	unsigned long virt = (unsigned long)addr;
 -
 -	if (virt >= VMALLOC_START && virt < VMALLOC_END)
 -		__iounmap(addr);
 -}
 -EXPORT_SYMBOL(at91_iounmap);
 -
  static void __init soc_detect(u32 dbgu_base)
  {
  	u32 cidr, socid;

Content of type "application/pgp-signature" skipped