All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
To: <ralf@linux-mips.org>, <catalin.marinas@arm.com>,
	<will.deacon@arm.com>, <tglx@linutronix.de>, <mingo@redhat.com>,
	<hpa@zytor.com>, <arnd@arndb.de>, <gregkh@linuxfoundation.org>,
	<m.szyprowski@samsung.com>, <mina86@mina86.com>
Cc: <x86@kernel.org>, <linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>, <linux-mips@linux-mips.org>,
	<linux-arch@vger.kernel.org>
Subject: [PATCH 2/4] arm64: use generic dma-contiguous.h
Date: Wed, 16 Jul 2014 16:51:30 +0100	[thread overview]
Message-ID: <1405525892-60383-3-git-send-email-Zubair.Kakakhel@imgtec.com> (raw)
In-Reply-To: <1405525892-60383-1-git-send-email-Zubair.Kakakhel@imgtec.com>

dma-contiguous.h is now in asm-generic. Use that to avoid code
repetition in arm64.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 arch/arm64/include/asm/Kbuild           |  1 +
 arch/arm64/include/asm/dma-contiguous.h | 28 ----------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 arch/arm64/include/asm/dma-contiguous.h

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 0b3fcf8..92bf7cb 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -9,6 +9,7 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-contiguous.h
 generic-y += emergency-restart.h
 generic-y += early_ioremap.h
 generic-y += errno.h
diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
deleted file mode 100644
index 14c4c0c..0000000
--- a/arch/arm64/include/asm/dma-contiguous.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _ASM_DMA_CONTIGUOUS_H
-#define _ASM_DMA_CONTIGUOUS_H
-
-#ifdef __KERNEL__
-#ifdef CONFIG_DMA_CMA
-
-#include <linux/types.h>
-
-static inline void
-dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
-
-#endif
-#endif
-
-#endif
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
To: ralf@linux-mips.org, catalin.marinas@arm.com,
	will.deacon@arm.com, tglx@linutronix.de, mingo@redhat.com,
	hpa@zytor.com, arnd@arndb.de, gregkh@linuxfoundation.org,
	m.szyprowski@samsung.com, mina86@mina86.com
Cc: linux-arch@vger.kernel.org, linux-mips@linux-mips.org,
	x86@kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] arm64: use generic dma-contiguous.h
Date: Wed, 16 Jul 2014 16:51:30 +0100	[thread overview]
Message-ID: <1405525892-60383-3-git-send-email-Zubair.Kakakhel@imgtec.com> (raw)
In-Reply-To: <1405525892-60383-1-git-send-email-Zubair.Kakakhel@imgtec.com>

dma-contiguous.h is now in asm-generic. Use that to avoid code
repetition in arm64.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 arch/arm64/include/asm/Kbuild           |  1 +
 arch/arm64/include/asm/dma-contiguous.h | 28 ----------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 arch/arm64/include/asm/dma-contiguous.h

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 0b3fcf8..92bf7cb 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -9,6 +9,7 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-contiguous.h
 generic-y += emergency-restart.h
 generic-y += early_ioremap.h
 generic-y += errno.h
diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
deleted file mode 100644
index 14c4c0c..0000000
--- a/arch/arm64/include/asm/dma-contiguous.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _ASM_DMA_CONTIGUOUS_H
-#define _ASM_DMA_CONTIGUOUS_H
-
-#ifdef __KERNEL__
-#ifdef CONFIG_DMA_CMA
-
-#include <linux/types.h>
-
-static inline void
-dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
-
-#endif
-#endif
-
-#endif
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
To: ralf@linux-mips.org, catalin.marinas@arm.com,
	will.deacon@arm.com, tglx@linutronix.de, mingo@redhat.com,
	hpa@zytor.com, arnd@arndb.de, gregkh@linuxfoundation.org,
	m.szyprowski@samsung.com, mina86@mina86.com
Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-mips@linux-mips.org,
	linux-arch@vger.kernel.org
Subject: [PATCH 2/4] arm64: use generic dma-contiguous.h
Date: Wed, 16 Jul 2014 16:51:30 +0100	[thread overview]
Message-ID: <1405525892-60383-3-git-send-email-Zubair.Kakakhel@imgtec.com> (raw)
Message-ID: <20140716155130.8bLHn5fsMP6PlvuZUOqFr6yqCaQnUs0x_TekwX-efck@z> (raw)
In-Reply-To: <1405525892-60383-1-git-send-email-Zubair.Kakakhel@imgtec.com>

dma-contiguous.h is now in asm-generic. Use that to avoid code
repetition in arm64.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 arch/arm64/include/asm/Kbuild           |  1 +
 arch/arm64/include/asm/dma-contiguous.h | 28 ----------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 arch/arm64/include/asm/dma-contiguous.h

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 0b3fcf8..92bf7cb 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -9,6 +9,7 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-contiguous.h
 generic-y += emergency-restart.h
 generic-y += early_ioremap.h
 generic-y += errno.h
diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
deleted file mode 100644
index 14c4c0c..0000000
--- a/arch/arm64/include/asm/dma-contiguous.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _ASM_DMA_CONTIGUOUS_H
-#define _ASM_DMA_CONTIGUOUS_H
-
-#ifdef __KERNEL__
-#ifdef CONFIG_DMA_CMA
-
-#include <linux/types.h>
-
-static inline void
-dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
-
-#endif
-#endif
-
-#endif
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: Zubair.Kakakhel@imgtec.com (Zubair Lutfullah Kakakhel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] arm64: use generic dma-contiguous.h
Date: Wed, 16 Jul 2014 16:51:30 +0100	[thread overview]
Message-ID: <1405525892-60383-3-git-send-email-Zubair.Kakakhel@imgtec.com> (raw)
In-Reply-To: <1405525892-60383-1-git-send-email-Zubair.Kakakhel@imgtec.com>

dma-contiguous.h is now in asm-generic. Use that to avoid code
repetition in arm64.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 arch/arm64/include/asm/Kbuild           |  1 +
 arch/arm64/include/asm/dma-contiguous.h | 28 ----------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 arch/arm64/include/asm/dma-contiguous.h

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 0b3fcf8..92bf7cb 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -9,6 +9,7 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-contiguous.h
 generic-y += emergency-restart.h
 generic-y += early_ioremap.h
 generic-y += errno.h
diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
deleted file mode 100644
index 14c4c0c..0000000
--- a/arch/arm64/include/asm/dma-contiguous.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _ASM_DMA_CONTIGUOUS_H
-#define _ASM_DMA_CONTIGUOUS_H
-
-#ifdef __KERNEL__
-#ifdef CONFIG_DMA_CMA
-
-#include <linux/types.h>
-
-static inline void
-dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
-
-#endif
-#endif
-
-#endif
-- 
1.9.1

  parent reply	other threads:[~2014-07-16 15:52 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-16 15:51 [PATCH 0/4] mips: Add cma support to mips Zubair Lutfullah Kakakhel
2014-07-16 15:51 ` Zubair Lutfullah Kakakhel
2014-07-16 15:51 ` Zubair Lutfullah Kakakhel
2014-07-16 15:51 ` [PATCH 1/4] asm-generic: Add dma-contiguous.h Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 15:59   ` Will Deacon
2014-07-16 15:59     ` Will Deacon
2014-07-16 15:59     ` Will Deacon
2014-07-16 16:20   ` Michal Nazarewicz
2014-07-16 16:20     ` Michal Nazarewicz
2014-07-16 15:51 ` Zubair Lutfullah Kakakhel [this message]
2014-07-16 15:51   ` [PATCH 2/4] arm64: use generic dma-contiguous.h Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 16:20   ` Michal Nazarewicz
2014-07-16 16:20     ` Michal Nazarewicz
2014-07-17 10:23   ` Catalin Marinas
2014-07-17 10:23     ` Catalin Marinas
2014-07-17 10:23     ` Catalin Marinas
2014-07-16 15:51 ` [PATCH 3/4] x86: " Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 16:20   ` Michal Nazarewicz
2014-07-16 16:20     ` Michal Nazarewicz
2014-07-17  9:02     ` Zubair Lutfullah Kakakhel
2014-07-17  9:02       ` Zubair Lutfullah Kakakhel
2014-07-17  9:02       ` Zubair Lutfullah Kakakhel
2014-07-16 15:51 ` [PATCH 4/4] mips: dma: Add cma support Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 15:51   ` Zubair Lutfullah Kakakhel
2014-07-16 16:39   ` Michal Nazarewicz
2014-07-16 16:39     ` Michal Nazarewicz
2014-07-17  9:17     ` Zubair Lutfullah Kakakhel
2014-07-17  9:17       ` Zubair Lutfullah Kakakhel
2014-07-16 16:18 ` [PATCH 0/4] mips: Add cma support to mips Manuel Lauss
2014-07-16 16:18   ` Manuel Lauss
2014-07-17  8:38   ` Manuel Lauss
2014-07-17  8:41     ` Zubair Lutfullah Kakakhel
2014-07-17  8:41       ` Zubair Lutfullah Kakakhel
2014-07-17 12:31 ` Marek Szyprowski
2014-07-17 12:31   ` Marek Szyprowski

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=1405525892-60383-3-git-send-email-Zubair.Kakakhel@imgtec.com \
    --to=zubair.kakakhel@imgtec.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mina86@mina86.com \
    --cc=mingo@redhat.com \
    --cc=ralf@linux-mips.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    --cc=x86@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.