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
| ||
|
Date: Thu, 18 Feb 2016 15:01:59 +0100 From: Arnd Bergmann <arnd@...db.de> To: Russell King <linux@....linux.org.uk> Cc: linux-arm-kernel@...ts.infradead.org, Arnd Bergmann <arnd@...db.de>, Ard Biesheuvel <ard.biesheuvel@...aro.org>, Nicolas Pitre <nico@...aro.org>, Jon Medhurst <tixy@...aro.org>, Marc Zyngier <marc.zyngier@....com>, linux-kernel@...r.kernel.org Subject: [PATCH 7/9] ARM: move NO_DMA definition to ecard.h The NO_DMA macro is only used on the RiscPC ecard bus, and conflicts with a couple of driver specific macros with the same name: drivers/scsi/eata.c:571:0: warning: "NO_DMA" redefined #define NO_DMA 0xff In file included from ../drivers/scsi/eata.c:495:0: arch/arm/include/asm/dma.h:140:0: note: this is the location of the previous definition #define NO_DMA 255 This moves the definition out of the asm/dma.h header that is used by all ISA DMA API users and into the ecard header. Signed-off-by: Arnd Bergmann <arnd@...db.de> --- arch/arm/include/asm/dma.h | 4 ---- arch/arm/include/asm/ecard.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index bb4fa67da541..573128481fc4 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -136,10 +136,6 @@ extern void set_dma_speed(unsigned int chan, int cycle_ns); */ extern int get_dma_residue(unsigned int chan); -#ifndef NO_DMA -#define NO_DMA 255 -#endif - #endif /* CONFIG_ISA_DMA_API */ #ifdef CONFIG_PCI diff --git a/arch/arm/include/asm/ecard.h b/arch/arm/include/asm/ecard.h index eaea14676d57..d3e16628c792 100644 --- a/arch/arm/include/asm/ecard.h +++ b/arch/arm/include/asm/ecard.h @@ -83,6 +83,10 @@ #define CONST const #endif +#ifndef NO_DMA +#define NO_DMA 255 +#endif + #define MAX_ECARDS 9 struct ecard_id { /* Card ID structure */ -- 2.7.0
Powered by blists - more mailing lists