Messages in this thread Patch in this message |  | | | Date | Mon, 25 Oct 2010 21:01:47 +0900 | | Subject | Re: [RFC PATCH 13/18] ARM: LPAE: ensure dma_addr_t is the same size as phys_addr_t | | From | FUJITA Tomonori <> |
| |
On Mon, 25 Oct 2010 12:32:09 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
> On Mon, 2010-10-25 at 12:08 +0100, Arnd Bergmann wrote: > > On Monday 25 October 2010, Catalin Marinas wrote: > > > From: Will Deacon <will.deacon@arm.com> > > > > > > Now that phys_addr_t can be 64-bit on ARM, we must ensure that dma_addr_t > > > is sufficiently large to hold physical addresses. > > > > > > This patch uses the types.h implementation in asm-generic to define the > > > dma_addr_t type as the same width as phys_addr_t. > > > > > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > > Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> > > > > This patch will become obsolete once the "unify dma_addr_t typedef" > > series from Fujita Tomonori is upstream, you will instead have to set > > CONFIG_ARCH_DMA_ADDR_T_64BIT. > > Yes, I know this and it's on my list to fix once I update the patches to > 2.6.37-rc1.
This patch also conflicts with the patchset removing dma64_addr_t (you really don't need dma64_addr_t):
http://marc.info/?l=linux-arch&m=128685377524976&w=2
Both in -mm and I think Andrew will merge both CONFIG_ARCH_DMA_ADDR_T_64BIT and dma64_addr_t patchset.
So how about dropping this patch and folding the following into your 18th patch. Then Andrew will not get the conflict and -rc1 works fine for you.
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index f2205e7..0a01b7b 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -617,6 +617,9 @@ config ARM_LPAE config ARCH_PHYS_ADDR_T_64BIT def_bool ARM_LPAE +config ARCH_DMA_ADDR_T_64BIT + def_bool ARM_LPAE + config ARM_THUMB bool "Support Thumb user binaries" depends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_V6 || CPU_V7 || CPU_FEROCEON
|  |