redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h

Browse source 
As reminded in http://lkml.org/lkml/2006/12/23/26, one should use
asm/hardware.h and asm/irq.h but absent-minded devs like me tends to use
asm/arch/hardware.h and/or asm/arch/irqs.h.
This patch aims at preventing such things.

In order to make it work, I had to modify asm-arm/irq.h too so that it can
be included from assembly files.
Also, as a side effect, I had to modify some headers who were using the
asm/arch/hardware.h or asm/arch/irqs.h.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Arnaud Patard 2006-12-27 22:56:44 +01:00 committed by Russell King
parent eb3b4783ba
commit 431d2cd99f
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/asm-arm/arch-s3c2410/dma.h
View file

@ -14,7 +14,7 @@
#define __ASM_ARCH_DMA_H __FILE__ #define __ASM_ARCH_DMA_H __FILE__
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include "hardware.h" #include <asm/hardware.h>
/* /*
* This is the maximum DMA address(physical address) that can be DMAd to. * This is the maximum DMA address(physical address) that can be DMAd to.

2
include/asm-arm/arch-s3c2410/entry-macro.S
View file

@ -20,7 +20,7 @@
#define INTOFFSET (0x14) #define INTOFFSET (0x14)
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/arch/irqs.h> #include <asm/irq.h>
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp .macro get_irqnr_and_base, irqnr, irqstat, base, tmp

4
include/asm-arm/arch-s3c2410/hardware.h
View file

@ -13,6 +13,10 @@
#ifndef __ASM_ARCH_HARDWARE_H #ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H
#ifndef __ASM_HARDWARE_H
#error "Do not include this directly, instead #include <asm/hardware.h>"
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* external functions for GPIO support /* external functions for GPIO support

3
include/asm-arm/arch-s3c2410/irqs.h
View file

@ -12,6 +12,9 @@
#ifndef __ASM_ARCH_IRQS_H #ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_IRQS_H __FILE__ #define __ASM_ARCH_IRQS_H __FILE__
#ifndef __ASM_ARM_IRQ_H
#error "Do not include this directly, instead #include <asm/irq.h>"
#endif
/* we keep the first set of CPU IRQs out of the range of /* we keep the first set of CPU IRQs out of the range of
* the ISA space, so that the PC104 has them to itself * the ISA space, so that the PC104 has them to itself

5
include/asm-arm/irq.h
View file

@ -19,7 +19,6 @@
#define NO_IRQ ((unsigned int)(-1)) #define NO_IRQ ((unsigned int)(-1))
#endif #endif
struct irqaction;
/* /*
* Migration helpers * Migration helpers
@ -37,6 +36,10 @@ struct irqaction;
#define IRQT_HIGH (__IRQT_HIGHLVL) #define IRQT_HIGH (__IRQT_HIGHLVL)
#define IRQT_PROBE IRQ_TYPE_PROBE #define IRQT_PROBE IRQ_TYPE_PROBE
#ifndef __ASSEMBLY__
struct irqaction;
extern void migrate_irqs(void); extern void migrate_irqs(void);
#endif #endif
#endif