* [PATCH 1/4] Clean asm/system.h from docs
2014-02-12 15:45 [PATCH 0/4] Final asm/system.h cleanups David Howells
@ 2014-02-12 15:45 ` David Howells
2014-02-12 15:45 ` David Howells
2014-02-12 15:45 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more David Howells
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: David Howells @ 2014-02-12 15:45 UTC (permalink / raw)
To: akpm; +Cc: dhowells, linux-arch, Ingo Molnar, linux-kernel, arnd
Clean asm/system.h from docs as nothing should refer to that header anymore.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ingo Molnar <mingo@redhat.com>
---
Documentation/DocBook/kernel-hacking.tmpl | 2 +-
Documentation/irqflags-tracing.txt | 7 -------
Documentation/scheduler/sched-arch.txt | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
index d0758b2..b90959b 100644
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
@@ -671,7 +671,7 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress);
<sect1 id="routines-local-irqs">
<title><function>local_irq_save()</function>/<function>local_irq_restore()</function>
- <filename class="headerfile">include/asm/system.h</filename>
+ <filename class="headerfile">include/linux/irqflags.h</filename>
</title>
<para>
diff --git a/Documentation/irqflags-tracing.txt b/Documentation/irqflags-tracing.txt
index 67aa71e..f6da056 100644
--- a/Documentation/irqflags-tracing.txt
+++ b/Documentation/irqflags-tracing.txt
@@ -22,13 +22,6 @@ rather straightforward and risk-free manner.
Architectures that want to support this need to do a couple of
code-organizational changes first:
-- move their irq-flags manipulation code from their asm/system.h header
- to asm/irqflags.h
-
-- rename local_irq_disable()/etc to raw_local_irq_disable()/etc. so that
- the linux/irqflags.h code can inject callbacks and can construct the
- real local_irq_disable()/etc APIs.
-
- add and enable TRACE_IRQFLAGS_SUPPORT in their arch level Kconfig file
and then a couple of functional changes are needed as well to implement
diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt
index 9290de7..a2f27bb 100644
--- a/Documentation/scheduler/sched-arch.txt
+++ b/Documentation/scheduler/sched-arch.txt
@@ -8,7 +8,7 @@ Context switch
By default, the switch_to arch function is called with the runqueue
locked. This is usually not a problem unless switch_to may need to
take the runqueue lock. This is usually due to a wake up operation in
-the context switch. See arch/ia64/include/asm/system.h for an example.
+the context switch. See arch/ia64/include/asm/switch_to.h for an example.
To request the scheduler call switch_to with the runqueue unlocked,
you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 1/4] Clean asm/system.h from docs
2014-02-12 15:45 ` [PATCH 1/4] Clean asm/system.h from docs David Howells
@ 2014-02-12 15:45 ` David Howells
0 siblings, 0 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:45 UTC (permalink / raw)
To: akpm; +Cc: dhowells, linux-arch, Ingo Molnar, linux-kernel, arnd
Clean asm/system.h from docs as nothing should refer to that header anymore.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ingo Molnar <mingo@redhat.com>
---
Documentation/DocBook/kernel-hacking.tmpl | 2 +-
Documentation/irqflags-tracing.txt | 7 -------
Documentation/scheduler/sched-arch.txt | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
index d0758b2..b90959b 100644
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
@@ -671,7 +671,7 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress);
<sect1 id="routines-local-irqs">
<title><function>local_irq_save()</function>/<function>local_irq_restore()</function>
- <filename class="headerfile">include/asm/system.h</filename>
+ <filename class="headerfile">include/linux/irqflags.h</filename>
</title>
<para>
diff --git a/Documentation/irqflags-tracing.txt b/Documentation/irqflags-tracing.txt
index 67aa71e..f6da056 100644
--- a/Documentation/irqflags-tracing.txt
+++ b/Documentation/irqflags-tracing.txt
@@ -22,13 +22,6 @@ rather straightforward and risk-free manner.
Architectures that want to support this need to do a couple of
code-organizational changes first:
-- move their irq-flags manipulation code from their asm/system.h header
- to asm/irqflags.h
-
-- rename local_irq_disable()/etc to raw_local_irq_disable()/etc. so that
- the linux/irqflags.h code can inject callbacks and can construct the
- real local_irq_disable()/etc APIs.
-
- add and enable TRACE_IRQFLAGS_SUPPORT in their arch level Kconfig file
and then a couple of functional changes are needed as well to implement
diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt
index 9290de7..a2f27bb 100644
--- a/Documentation/scheduler/sched-arch.txt
+++ b/Documentation/scheduler/sched-arch.txt
@@ -8,7 +8,7 @@ Context switch
By default, the switch_to arch function is called with the runqueue
locked. This is usually not a problem unless switch_to may need to
take the runqueue lock. This is usually due to a wake up operation in
-the context switch. See arch/ia64/include/asm/system.h for an example.
+the context switch. See arch/ia64/include/asm/switch_to.h for an example.
To request the scheduler call switch_to with the runqueue unlocked,
you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more
2014-02-12 15:45 [PATCH 0/4] Final asm/system.h cleanups David Howells
2014-02-12 15:45 ` [PATCH 1/4] Clean asm/system.h from docs David Howells
@ 2014-02-12 15:45 ` David Howells
2014-02-12 15:45 ` David Howells
` (2 more replies)
2014-02-12 15:46 ` [PATCH 3/4] UM: arch_align_stack() moved to asm/exec.h David Howells
2014-02-12 15:46 ` [PATCH 4/4] ARM: Delete asm/system.h David Howells
3 siblings, 3 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:45 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, arnd, linux-kernel, dhowells, sparclinux,
David S. Miller
sparc_cpu_model isn't in asm/system.h any more, so remove a comment about it.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: sparclinux@vger.kernel.org
---
drivers/sbus/char/jsflash.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6b4678a..018b64b 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -507,11 +507,9 @@ static int jsflash_init(void)
}
/* Let us be really paranoid for modifications to probing code. */
- /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
- if (sparc_cpu_model != sun4m) {
+ if (sparc_cpu_model != sun4m)
/* We must be on sun4m because we use MMU Bypass ASI. */
return -ENXIO;
- }
if (jsf0.base == 0) {
jsf = &jsf0;
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more
2014-02-12 15:45 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more David Howells
@ 2014-02-12 15:45 ` David Howells
2014-02-20 0:47 ` David Miller
2014-02-20 16:08 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2] David Howells
2 siblings, 0 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:45 UTC (permalink / raw)
To: akpm; +Cc: linux-arch, arnd, linux-kernel, dhowells, sparclinux,
David S. Miller
sparc_cpu_model isn't in asm/system.h any more, so remove a comment about it.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: sparclinux@vger.kernel.org
---
drivers/sbus/char/jsflash.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6b4678a..018b64b 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -507,11 +507,9 @@ static int jsflash_init(void)
}
/* Let us be really paranoid for modifications to probing code. */
- /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
- if (sparc_cpu_model != sun4m) {
+ if (sparc_cpu_model != sun4m)
/* We must be on sun4m because we use MMU Bypass ASI. */
return -ENXIO;
- }
if (jsf0.base == 0) {
jsf = &jsf0;
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more
2014-02-12 15:45 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more David Howells
2014-02-12 15:45 ` David Howells
@ 2014-02-20 0:47 ` David Miller
2014-02-20 16:08 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2] David Howells
2 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2014-02-20 0:47 UTC (permalink / raw)
To: dhowells; +Cc: akpm, linux-arch, arnd, linux-kernel, sparclinux
From: David Howells <dhowells@redhat.com>
Date: Wed, 12 Feb 2014 15:45:59 +0000
> sparc_cpu_model isn't in asm/system.h any more, so remove a comment about it.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
That's not all your patch does:
> - /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
> - if (sparc_cpu_model != sun4m) {
> + if (sparc_cpu_model != sun4m)
> /* We must be on sun4m because we use MMU Bypass ASI. */
> return -ENXIO;
> - }
The basic block is more than one line, therefore the braces are
appropriate. Please do not remove them, and especially do not
remove them without mentioning them in the commit message.
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2]
2014-02-12 15:45 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more David Howells
2014-02-12 15:45 ` David Howells
2014-02-20 0:47 ` David Miller
@ 2014-02-20 16:08 ` David Howells
2014-02-20 18:34 ` David Miller
2 siblings, 1 reply; 14+ messages in thread
From: David Howells @ 2014-02-20 16:08 UTC (permalink / raw)
To: akpm, davem; +Cc: dhowells, linux-arch, arnd, linux-kernel, sparclinux
sparc_cpu_model isn't in asm/system.h any more, so remove a comment about it.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: sparclinux@vger.kernel.org
---
drivers/sbus/char/jsflash.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6b4678a..4ccb5d8 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -507,7 +507,6 @@ static int jsflash_init(void)
}
/* Let us be really paranoid for modifications to probing code. */
- /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
if (sparc_cpu_model != sun4m) {
/* We must be on sun4m because we use MMU Bypass ASI. */
return -ENXIO;
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/4] UM: arch_align_stack() moved to asm/exec.h
2014-02-12 15:45 [PATCH 0/4] Final asm/system.h cleanups David Howells
2014-02-12 15:45 ` [PATCH 1/4] Clean asm/system.h from docs David Howells
2014-02-12 15:45 ` [PATCH 2/4] Sparc: sparc_cpu_model isn't in asm/system.h any more David Howells
@ 2014-02-12 15:46 ` David Howells
2014-02-12 15:46 ` David Howells
2014-02-12 15:46 ` [PATCH 4/4] ARM: Delete asm/system.h David Howells
3 siblings, 1 reply; 14+ messages in thread
From: David Howells @ 2014-02-12 15:46 UTC (permalink / raw)
To: akpm
Cc: linux-arch, arnd, user-mode-linux-devel, Richard Weinberger,
Jeff Dike, linux-kernel, dhowells
arch_align_stack() moved to asm/exec.h, so change the comment referring to
asm/system.h which no longer exists.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Dike <jdike@addtoit.com>
cc: Richard Weinberger <richard@nod.at>
cc: user-mode-linux-devel@lists.sourceforge.net
---
arch/um/kernel/process.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index eecc414..f17bca8 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -359,7 +359,7 @@ int singlestepping(void * t)
/*
* Only x86 and x86_64 have an arch_align_stack().
* All other arches have "#define arch_align_stack(x) (x)"
- * in their asm/system.h
+ * in their asm/exec.h
* As this is included in UML from asm-um/system-generic.h,
* we can use it to behave as the subarch does.
*/
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/4] UM: arch_align_stack() moved to asm/exec.h
2014-02-12 15:46 ` [PATCH 3/4] UM: arch_align_stack() moved to asm/exec.h David Howells
@ 2014-02-12 15:46 ` David Howells
0 siblings, 0 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:46 UTC (permalink / raw)
To: akpm
Cc: linux-arch, arnd, user-mode-linux-devel, Richard Weinberger,
Jeff Dike, linux-kernel, dhowells
arch_align_stack() moved to asm/exec.h, so change the comment referring to
asm/system.h which no longer exists.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Dike <jdike@addtoit.com>
cc: Richard Weinberger <richard@nod.at>
cc: user-mode-linux-devel@lists.sourceforge.net
---
arch/um/kernel/process.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index eecc414..f17bca8 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -359,7 +359,7 @@ int singlestepping(void * t)
/*
* Only x86 and x86_64 have an arch_align_stack().
* All other arches have "#define arch_align_stack(x) (x)"
- * in their asm/system.h
+ * in their asm/exec.h
* As this is included in UML from asm-um/system-generic.h,
* we can use it to behave as the subarch does.
*/
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/4] ARM: Delete asm/system.h
2014-02-12 15:45 [PATCH 0/4] Final asm/system.h cleanups David Howells
` (2 preceding siblings ...)
2014-02-12 15:46 ` [PATCH 3/4] UM: arch_align_stack() moved to asm/exec.h David Howells
@ 2014-02-12 15:46 ` David Howells
2014-02-12 15:46 ` David Howells
2014-02-12 16:54 ` Arnd Bergmann
3 siblings, 2 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:46 UTC (permalink / raw)
To: akpm
Cc: linux-arch, Russell King, arnd, linux-kernel, dhowells,
linux-arm-kernel
Delete ARM's asm/system.h. It's the last holdout and should be got rid of.
This builds for defconfig, lpc32xx_defconfig, exynos_defconfig + XEN, the
previous changed to a Gemini system and an omap3 config with TI_DAVINCI_EMAC.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Russell King <linux@arm.linux.org.uk>
cc: linux-arm-kernel@lists.infradead.org
---
arch/arm/include/asm/jump_label.h | 1 -
arch/arm/include/asm/sync_bitops.h | 1 -
arch/arm/include/asm/system.h | 7 -------
arch/arm/mach-gemini/idle.c | 2 +-
arch/arm/mach-omap2/am35xx-emac.c | 1 -
drivers/usb/gadget/lpc32xx_udc.c | 1 -
6 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 arch/arm/include/asm/system.h
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h
index 863c892..70f9b9b 100644
--- a/arch/arm/include/asm/jump_label.h
+++ b/arch/arm/include/asm/jump_label.h
@@ -4,7 +4,6 @@
#ifdef __KERNEL__
#include <linux/types.h>
-#include <asm/system.h>
#define JUMP_LABEL_NOP_SIZE 4
diff --git a/arch/arm/include/asm/sync_bitops.h b/arch/arm/include/asm/sync_bitops.h
index 63479ee..9732b8e 100644
--- a/arch/arm/include/asm/sync_bitops.h
+++ b/arch/arm/include/asm/sync_bitops.h
@@ -2,7 +2,6 @@
#define __ASM_SYNC_BITOPS_H__
#include <asm/bitops.h>
-#include <asm/system.h>
/* sync_bitops functions are equivalent to the SMP implementation of the
* original functions, independently from CONFIG_SMP being defined.
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
deleted file mode 100644
index 368165e..0000000
--- a/arch/arm/include/asm/system.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
-#include <asm/barrier.h>
-#include <asm/compiler.h>
-#include <asm/cmpxchg.h>
-#include <asm/switch_to.h>
-#include <asm/system_info.h>
-#include <asm/system_misc.h>
diff --git a/arch/arm/mach-gemini/idle.c b/arch/arm/mach-gemini/idle.c
index 87dff4f..ddf8ec9 100644
--- a/arch/arm/mach-gemini/idle.c
+++ b/arch/arm/mach-gemini/idle.c
@@ -3,7 +3,7 @@
*/
#include <linux/init.h>
-#include <asm/system.h>
+#include <asm/system_misc.h>
#include <asm/proc-fns.h>
static void gemini_idle(void)
diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c
index 25b79a2..6a6935c 100644
--- a/arch/arm/mach-omap2/am35xx-emac.c
+++ b/arch/arm/mach-omap2/am35xx-emac.c
@@ -17,7 +17,6 @@
#include <linux/err.h>
#include <linux/davinci_emac.h>
-#include <asm/system.h>
#include "omap_device.h"
#include "am35xx.h"
#include "control.h"
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 049ebab..a94bb10 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -55,7 +55,6 @@
#include <mach/hardware.h>
#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/system.h>
#include <mach/platform.h>
#include <mach/irqs.h>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/4] ARM: Delete asm/system.h
2014-02-12 15:46 ` [PATCH 4/4] ARM: Delete asm/system.h David Howells
@ 2014-02-12 15:46 ` David Howells
2014-02-12 16:54 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: David Howells @ 2014-02-12 15:46 UTC (permalink / raw)
To: akpm
Cc: linux-arch, Russell King, arnd, linux-kernel, dhowells,
linux-arm-kernel
Delete ARM's asm/system.h. It's the last holdout and should be got rid of.
This builds for defconfig, lpc32xx_defconfig, exynos_defconfig + XEN, the
previous changed to a Gemini system and an omap3 config with TI_DAVINCI_EMAC.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Russell King <linux@arm.linux.org.uk>
cc: linux-arm-kernel@lists.infradead.org
---
arch/arm/include/asm/jump_label.h | 1 -
arch/arm/include/asm/sync_bitops.h | 1 -
arch/arm/include/asm/system.h | 7 -------
arch/arm/mach-gemini/idle.c | 2 +-
arch/arm/mach-omap2/am35xx-emac.c | 1 -
drivers/usb/gadget/lpc32xx_udc.c | 1 -
6 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 arch/arm/include/asm/system.h
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h
index 863c892..70f9b9b 100644
--- a/arch/arm/include/asm/jump_label.h
+++ b/arch/arm/include/asm/jump_label.h
@@ -4,7 +4,6 @@
#ifdef __KERNEL__
#include <linux/types.h>
-#include <asm/system.h>
#define JUMP_LABEL_NOP_SIZE 4
diff --git a/arch/arm/include/asm/sync_bitops.h b/arch/arm/include/asm/sync_bitops.h
index 63479ee..9732b8e 100644
--- a/arch/arm/include/asm/sync_bitops.h
+++ b/arch/arm/include/asm/sync_bitops.h
@@ -2,7 +2,6 @@
#define __ASM_SYNC_BITOPS_H__
#include <asm/bitops.h>
-#include <asm/system.h>
/* sync_bitops functions are equivalent to the SMP implementation of the
* original functions, independently from CONFIG_SMP being defined.
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
deleted file mode 100644
index 368165e..0000000
--- a/arch/arm/include/asm/system.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
-#include <asm/barrier.h>
-#include <asm/compiler.h>
-#include <asm/cmpxchg.h>
-#include <asm/switch_to.h>
-#include <asm/system_info.h>
-#include <asm/system_misc.h>
diff --git a/arch/arm/mach-gemini/idle.c b/arch/arm/mach-gemini/idle.c
index 87dff4f..ddf8ec9 100644
--- a/arch/arm/mach-gemini/idle.c
+++ b/arch/arm/mach-gemini/idle.c
@@ -3,7 +3,7 @@
*/
#include <linux/init.h>
-#include <asm/system.h>
+#include <asm/system_misc.h>
#include <asm/proc-fns.h>
static void gemini_idle(void)
diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c
index 25b79a2..6a6935c 100644
--- a/arch/arm/mach-omap2/am35xx-emac.c
+++ b/arch/arm/mach-omap2/am35xx-emac.c
@@ -17,7 +17,6 @@
#include <linux/err.h>
#include <linux/davinci_emac.h>
-#include <asm/system.h>
#include "omap_device.h"
#include "am35xx.h"
#include "control.h"
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 049ebab..a94bb10 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -55,7 +55,6 @@
#include <mach/hardware.h>
#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/system.h>
#include <mach/platform.h>
#include <mach/irqs.h>
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 4/4] ARM: Delete asm/system.h
2014-02-12 15:46 ` [PATCH 4/4] ARM: Delete asm/system.h David Howells
2014-02-12 15:46 ` David Howells
@ 2014-02-12 16:54 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2014-02-12 16:54 UTC (permalink / raw)
To: David Howells
Cc: akpm, linux-arch, Russell King, linux-kernel, linux-arm-kernel
On Wednesday 12 February 2014 15:46:15 David Howells wrote:
> Delete ARM's asm/system.h. It's the last holdout and should be got rid of.
>
> This builds for defconfig, lpc32xx_defconfig, exynos_defconfig + XEN, the
> previous changed to a Gemini system and an omap3 config with TI_DAVINCI_EMAC.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Russell King <linux@arm.linux.org.uk>
> cc: linux-arm-kernel@lists.infradead.org
Acked-by: Arnd Bergmann <arnd@arndb.de>
I've added this to my randconfig builder, will let you know when unexpected
bugs show up (probably won't).
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread