From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753424AbYE2NCX (ORCPT ); Thu, 29 May 2008 09:02:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752941AbYE2NBG (ORCPT ); Thu, 29 May 2008 09:01:06 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:64627 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbYE2NBC (ORCPT ); Thu, 29 May 2008 09:01:02 -0400 Message-Id: <20080529125728.861980900@de.ibm.com> References: <20080529125501.196123527@de.ibm.com> User-Agent: quilt/0.46-1 Date: Thu, 29 May 2008 14:55:04 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Christian Borntraeger , Martin Schwidefsky Subject: [patch 03/11] s390 types: make dma_addr_t 64 bit capable Content-Disposition: inline; filename=003-dma-64bit.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian Borntraeger virtio tests with guests larger than 4 GB revealed that the dma_addr_t definition for s390 did not make it into the 64bit world. This patch changes the definition on s390 to have an u64 on 64bit and u32 on 32bit systems. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky --- include/asm-s390/types.h | 6 ++++++ 1 file changed, 6 insertions(+) Index: quilt-2.6/include/asm-s390/types.h =================================================================== --- quilt-2.6.orig/include/asm-s390/types.h +++ quilt-2.6/include/asm-s390/types.h @@ -40,7 +40,13 @@ typedef __signed__ long saddr_t; #ifndef __ASSEMBLY__ +typedef u64 dma64_addr_t; +#ifdef __s390x__ +/* DMA addresses come in 32-bit and 64-bit flavours. */ +typedef u64 dma_addr_t; +#else typedef u32 dma_addr_t; +#endif #ifndef __s390x__ typedef union { -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.