linux-kernel - linux-next: manual merge of the msm 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20101018103540.7bd9c535.sfr@canb.auug.org.au>
Date:	Mon, 18 Oct 2010 10:35:40 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Walker <dwalker@...o99.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jeremy Kerr <jeremy.kerr@...onical.com>,
	Jeff Ohlstein <johlstei@...eaurora.org>
Subject: linux-next: manual merge of the msm tree with the arm tree

Hi Daniel,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/include/mach/debug-macro.S between commit
08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
virtual addresses from addruart") from the arm tree and commit
46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
conditionally disabled") from the msm 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-msm/include/mach/debug-macro.S
index 3c35b0d,238c4f1..0000000
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@@ -19,11 -19,13 +19,11 @@@
  #include <mach/hardware.h>
  #include <mach/msm_iomap.h>
  
- #ifdef CONFIG_MSM_DEBUG_UART
+ #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
 -	.macro	addruart, rx, tmp
 +	.macro	addruart, rp, rv
  	@ see if the MMU is enabled and select appropriate base address
 -	mrc	p15, 0, \rx, c1, c0
 -	tst	\rx, #1
 -	ldreq	\rx, =MSM_DEBUG_UART_PHYS
 -	ldrne	\rx, =MSM_DEBUG_UART_BASE
 +	ldr	\rp, =MSM_DEBUG_UART_PHYS
 +	ldr	\rv, =MSM_DEBUG_UART_BASE
  	.endm
  
  	.macro	senduart,rd,rx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/