diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 18:58:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 18:58:21 -0400 |
commit | 0195c00244dc2e9f522475868fa278c473ba7339 (patch) | |
tree | f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed /arch/avr32 | |
parent | f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5 (diff) | |
parent | 141124c02059eee9dbc5c86ea797b1ca888e77f7 (diff) |
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
Pull "Disintegrate and delete asm/system.h" from David Howells:
"Here are a bunch of patches to disintegrate asm/system.h into a set of
separate bits to relieve the problem of circular inclusion
dependencies.
I've built all the working defconfigs from all the arches that I can
and made sure that they don't break.
The reason for these patches is that I recently encountered a circular
dependency problem that came about when I produced some patches to
optimise get_order() by rewriting it to use ilog2().
This uses bitops - and on the SH arch asm/bitops.h drags in
asm-generic/get_order.h by a circuituous route involving asm/system.h.
The main difficulty seems to be asm/system.h. It holds a number of
low level bits with no/few dependencies that are commonly used (eg.
memory barriers) and a number of bits with more dependencies that
aren't used in many places (eg. switch_to()).
These patches break asm/system.h up into the following core pieces:
(1) asm/barrier.h
Move memory barriers here. This already done for MIPS and Alpha.
(2) asm/switch_to.h
Move switch_to() and related stuff here.
(3) asm/exec.h
Move arch_align_stack() here. Other process execution related bits
could perhaps go here from asm/processor.h.
(4) asm/cmpxchg.h
Move xchg() and cmpxchg() here as they're full word atomic ops and
frequently used by atomic_xchg() and atomic_cmpxchg().
(5) asm/bug.h
Move die() and related bits.
(6) asm/auxvec.h
Move AT_VECTOR_SIZE_ARCH here.
Other arch headers are created as needed on a per-arch basis."
Fixed up some conflicts from other header file cleanups and moving code
around that has happened in the meantime, so David's testing is somewhat
weakened by that. We'll find out anything that got broken and fix it..
* tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)
Delete all instances of asm/system.h
Remove all #inclusions of asm/system.h
Add #includes needed to permit the removal of asm/system.h
Move all declarations of free_initmem() to linux/mm.h
Disintegrate asm/system.h for OpenRISC
Split arch_align_stack() out from asm-generic/system.h
Split the switch_to() wrapper out of asm-generic/system.h
Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
Create asm-generic/barrier.h
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
Disintegrate asm/system.h for Xtensa
Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
Disintegrate asm/system.h for Tile
Disintegrate asm/system.h for Sparc
Disintegrate asm/system.h for SH
Disintegrate asm/system.h for Score
Disintegrate asm/system.h for S390
Disintegrate asm/system.h for PowerPC
Disintegrate asm/system.h for PA-RISC
Disintegrate asm/system.h for MN10300
...
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/include/asm/atomic.h | 2 | ||||
-rw-r--r-- | arch/avr32/include/asm/barrier.h | 27 | ||||
-rw-r--r-- | arch/avr32/include/asm/bitops.h | 1 | ||||
-rw-r--r-- | arch/avr32/include/asm/bug.h | 5 | ||||
-rw-r--r-- | arch/avr32/include/asm/cmpxchg.h (renamed from arch/avr32/include/asm/system.h) | 79 | ||||
-rw-r--r-- | arch/avr32/include/asm/exec.h | 13 | ||||
-rw-r--r-- | arch/avr32/include/asm/special_insns.h | 13 | ||||
-rw-r--r-- | arch/avr32/include/asm/switch_to.h | 46 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/cpufreq.c | 1 | ||||
-rw-r--r-- | arch/avr32/oprofile/op_model_avr32.c | 1 |
10 files changed, 114 insertions, 74 deletions
diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h index e0ac2631c87e..61407279208a 100644 --- a/arch/avr32/include/asm/atomic.h +++ b/arch/avr32/include/asm/atomic.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #define __ASM_AVR32_ATOMIC_H | 15 | #define __ASM_AVR32_ATOMIC_H |
16 | 16 | ||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <asm/system.h> | 18 | #include <asm/cmpxchg.h> |
19 | 19 | ||
20 | #define ATOMIC_INIT(i) { (i) } | 20 | #define ATOMIC_INIT(i) { (i) } |
21 | 21 | ||
diff --git a/arch/avr32/include/asm/barrier.h b/arch/avr32/include/asm/barrier.h new file mode 100644 index 000000000000..808001c9cf8c --- /dev/null +++ b/arch/avr32/include/asm/barrier.h | |||
@@ -0,0 +1,27 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004-2006 Atmel Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | #ifndef __ASM_AVR32_BARRIER_H | ||
9 | #define __ASM_AVR32_BARRIER_H | ||
10 | |||
11 | #define mb() asm volatile("" : : : "memory") | ||
12 | #define rmb() mb() | ||
13 | #define wmb() asm volatile("sync 0" : : : "memory") | ||
14 | #define read_barrier_depends() do { } while(0) | ||
15 | #define set_mb(var, value) do { var = value; mb(); } while(0) | ||
16 | |||
17 | #ifdef CONFIG_SMP | ||
18 | # error "The AVR32 port does not support SMP" | ||
19 | #else | ||
20 | # define smp_mb() barrier() | ||
21 | # define smp_rmb() barrier() | ||
22 | # define smp_wmb() barrier() | ||
23 | # define smp_read_barrier_depends() do { } while(0) | ||
24 | #endif | ||
25 | |||
26 | |||
27 | #endif /* __ASM_AVR32_BARRIER_H */ | ||
diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h index b70c19bab63a..ebe7ad3f490b 100644 --- a/arch/avr32/include/asm/bitops.h +++ b/arch/avr32/include/asm/bitops.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #include <asm/byteorder.h> | 15 | #include <asm/byteorder.h> |
16 | #include <asm/system.h> | ||
17 | 16 | ||
18 | /* | 17 | /* |
19 | * clear_bit() doesn't provide any barrier for the compiler | 18 | * clear_bit() doesn't provide any barrier for the compiler |
diff --git a/arch/avr32/include/asm/bug.h b/arch/avr32/include/asm/bug.h index 2aa373cc61b5..85a92d099adb 100644 --- a/arch/avr32/include/asm/bug.h +++ b/arch/avr32/include/asm/bug.h | |||
@@ -70,4 +70,9 @@ | |||
70 | 70 | ||
71 | #include <asm-generic/bug.h> | 71 | #include <asm-generic/bug.h> |
72 | 72 | ||
73 | struct pt_regs; | ||
74 | void die(const char *str, struct pt_regs *regs, long err); | ||
75 | void _exception(long signr, struct pt_regs *regs, int code, | ||
76 | unsigned long addr); | ||
77 | |||
73 | #endif /* __ASM_AVR32_BUG_H */ | 78 | #endif /* __ASM_AVR32_BUG_H */ |
diff --git a/arch/avr32/include/asm/system.h b/arch/avr32/include/asm/cmpxchg.h index 62d9ded01635..962a6aeab787 100644 --- a/arch/avr32/include/asm/system.h +++ b/arch/avr32/include/asm/cmpxchg.h | |||
@@ -1,76 +1,22 @@ | |||
1 | /* | 1 | /* |
2 | * Atomic operations that C can't guarantee us. Useful for | ||
3 | * resource counting etc. | ||
4 | * | ||
5 | * But use these as seldom as possible since they are slower than | ||
6 | * regular operations. | ||
7 | * | ||
2 | * Copyright (C) 2004-2006 Atmel Corporation | 8 | * Copyright (C) 2004-2006 Atmel Corporation |
3 | * | 9 | * |
4 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
7 | */ | 13 | */ |
8 | #ifndef __ASM_AVR32_SYSTEM_H | 14 | #ifndef __ASM_AVR32_CMPXCHG_H |
9 | #define __ASM_AVR32_SYSTEM_H | 15 | #define __ASM_AVR32_CMPXCHG_H |
10 | |||
11 | #include <linux/compiler.h> | ||
12 | #include <linux/linkage.h> | ||
13 | #include <linux/types.h> | ||
14 | |||
15 | #include <asm/ptrace.h> | ||
16 | #include <asm/sysreg.h> | ||
17 | 16 | ||
18 | #define xchg(ptr,x) \ | 17 | #define xchg(ptr,x) \ |
19 | ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) | 18 | ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) |
20 | 19 | ||
21 | #define nop() asm volatile("nop") | ||
22 | |||
23 | #define mb() asm volatile("" : : : "memory") | ||
24 | #define rmb() mb() | ||
25 | #define wmb() asm volatile("sync 0" : : : "memory") | ||
26 | #define read_barrier_depends() do { } while(0) | ||
27 | #define set_mb(var, value) do { var = value; mb(); } while(0) | ||
28 | |||
29 | /* | ||
30 | * Help PathFinder and other Nexus-compliant debuggers keep track of | ||
31 | * the current PID by emitting an Ownership Trace Message each time we | ||
32 | * switch task. | ||
33 | */ | ||
34 | #ifdef CONFIG_OWNERSHIP_TRACE | ||
35 | #include <asm/ocd.h> | ||
36 | #define finish_arch_switch(prev) \ | ||
37 | do { \ | ||
38 | ocd_write(PID, prev->pid); \ | ||
39 | ocd_write(PID, current->pid); \ | ||
40 | } while(0) | ||
41 | #endif | ||
42 | |||
43 | /* | ||
44 | * switch_to(prev, next, last) should switch from task `prev' to task | ||
45 | * `next'. `prev' will never be the same as `next'. | ||
46 | * | ||
47 | * We just delegate everything to the __switch_to assembly function, | ||
48 | * which is implemented in arch/avr32/kernel/switch_to.S | ||
49 | * | ||
50 | * mb() tells GCC not to cache `current' across this call. | ||
51 | */ | ||
52 | struct cpu_context; | ||
53 | struct task_struct; | ||
54 | extern struct task_struct *__switch_to(struct task_struct *, | ||
55 | struct cpu_context *, | ||
56 | struct cpu_context *); | ||
57 | #define switch_to(prev, next, last) \ | ||
58 | do { \ | ||
59 | last = __switch_to(prev, &prev->thread.cpu_context + 1, \ | ||
60 | &next->thread.cpu_context); \ | ||
61 | } while (0) | ||
62 | |||
63 | #ifdef CONFIG_SMP | ||
64 | # error "The AVR32 port does not support SMP" | ||
65 | #else | ||
66 | # define smp_mb() barrier() | ||
67 | # define smp_rmb() barrier() | ||
68 | # define smp_wmb() barrier() | ||
69 | # define smp_read_barrier_depends() do { } while(0) | ||
70 | #endif | ||
71 | |||
72 | #include <linux/irqflags.h> | ||
73 | |||
74 | extern void __xchg_called_with_bad_pointer(void); | 20 | extern void __xchg_called_with_bad_pointer(void); |
75 | 21 | ||
76 | static inline unsigned long xchg_u32(u32 val, volatile u32 *m) | 22 | static inline unsigned long xchg_u32(u32 val, volatile u32 *m) |
@@ -168,11 +114,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, | |||
168 | 114 | ||
169 | #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) | 115 | #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) |
170 | 116 | ||
171 | struct pt_regs; | 117 | #endif /* __ASM_AVR32_CMPXCHG_H */ |
172 | void die(const char *str, struct pt_regs *regs, long err); | ||
173 | void _exception(long signr, struct pt_regs *regs, int code, | ||
174 | unsigned long addr); | ||
175 | |||
176 | #define arch_align_stack(x) (x) | ||
177 | |||
178 | #endif /* __ASM_AVR32_SYSTEM_H */ | ||
diff --git a/arch/avr32/include/asm/exec.h b/arch/avr32/include/asm/exec.h new file mode 100644 index 000000000000..f467be8bf823 --- /dev/null +++ b/arch/avr32/include/asm/exec.h | |||
@@ -0,0 +1,13 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004-2006 Atmel Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | #ifndef __ASM_AVR32_EXEC_H | ||
9 | #define __ASM_AVR32_EXEC_H | ||
10 | |||
11 | #define arch_align_stack(x) (x) | ||
12 | |||
13 | #endif /* __ASM_AVR32_EXEC_H */ | ||
diff --git a/arch/avr32/include/asm/special_insns.h b/arch/avr32/include/asm/special_insns.h new file mode 100644 index 000000000000..f922218dfaa5 --- /dev/null +++ b/arch/avr32/include/asm/special_insns.h | |||
@@ -0,0 +1,13 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004-2006 Atmel Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | #ifndef __ASM_AVR32_SPECIAL_INSNS_H | ||
9 | #define __ASM_AVR32_SPECIAL_INSNS_H | ||
10 | |||
11 | #define nop() asm volatile("nop") | ||
12 | |||
13 | #endif /* __ASM_AVR32_SPECIAL_INSNS_H */ | ||
diff --git a/arch/avr32/include/asm/switch_to.h b/arch/avr32/include/asm/switch_to.h new file mode 100644 index 000000000000..9a8e9d5208d4 --- /dev/null +++ b/arch/avr32/include/asm/switch_to.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004-2006 Atmel Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | #ifndef __ASM_AVR32_SWITCH_TO_H | ||
9 | #define __ASM_AVR32_SWITCH_TO_H | ||
10 | |||
11 | /* | ||
12 | * Help PathFinder and other Nexus-compliant debuggers keep track of | ||
13 | * the current PID by emitting an Ownership Trace Message each time we | ||
14 | * switch task. | ||
15 | */ | ||
16 | #ifdef CONFIG_OWNERSHIP_TRACE | ||
17 | #include <asm/ocd.h> | ||
18 | #define finish_arch_switch(prev) \ | ||
19 | do { \ | ||
20 | ocd_write(PID, prev->pid); \ | ||
21 | ocd_write(PID, current->pid); \ | ||
22 | } while(0) | ||
23 | #endif | ||
24 | |||
25 | /* | ||
26 | * switch_to(prev, next, last) should switch from task `prev' to task | ||
27 | * `next'. `prev' will never be the same as `next'. | ||
28 | * | ||
29 | * We just delegate everything to the __switch_to assembly function, | ||
30 | * which is implemented in arch/avr32/kernel/switch_to.S | ||
31 | * | ||
32 | * mb() tells GCC not to cache `current' across this call. | ||
33 | */ | ||
34 | struct cpu_context; | ||
35 | struct task_struct; | ||
36 | extern struct task_struct *__switch_to(struct task_struct *, | ||
37 | struct cpu_context *, | ||
38 | struct cpu_context *); | ||
39 | #define switch_to(prev, next, last) \ | ||
40 | do { \ | ||
41 | last = __switch_to(prev, &prev->thread.cpu_context + 1, \ | ||
42 | &next->thread.cpu_context); \ | ||
43 | } while (0) | ||
44 | |||
45 | |||
46 | #endif /* __ASM_AVR32_SWITCH_TO_H */ | ||
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c index 627743326253..18b765629a0c 100644 --- a/arch/avr32/mach-at32ap/cpufreq.c +++ b/arch/avr32/mach-at32ap/cpufreq.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
21 | #include <linux/export.h> | 21 | #include <linux/export.h> |
22 | #include <asm/system.h> | ||
23 | 22 | ||
24 | static struct clk *cpuclk; | 23 | static struct clk *cpuclk; |
25 | 24 | ||
diff --git a/arch/avr32/oprofile/op_model_avr32.c b/arch/avr32/oprofile/op_model_avr32.c index a3e9b3c4845a..f74b7809e089 100644 --- a/arch/avr32/oprofile/op_model_avr32.c +++ b/arch/avr32/oprofile/op_model_avr32.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | 18 | ||
19 | #include <asm/sysreg.h> | 19 | #include <asm/sysreg.h> |
20 | #include <asm/system.h> | ||
21 | 20 | ||
22 | #define AVR32_PERFCTR_IRQ_GROUP 0 | 21 | #define AVR32_PERFCTR_IRQ_GROUP 0 |
23 | #define AVR32_PERFCTR_IRQ_LINE 1 | 22 | #define AVR32_PERFCTR_IRQ_LINE 1 |