diff options
author | Brian Gerst <brgerst@gmail.com> | 2009-01-18 19:52:25 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-01-19 22:29:20 -0500 |
commit | 0d974d4592708f85044751817da4b7016e1b0602 (patch) | |
tree | befe4e98f3e36b7ffe8637693e202a283262ad5d | |
parent | 947e76cdc34c782fc947313d4331380686eebbad (diff) |
x86: remove pda.h
Impact: cleanup
Signed-off-by: Brian Gerst <brgerst@gmail.com>
-rw-r--r-- | arch/x86/include/asm/pda.h | 39 | ||||
-rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/process_64.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/traps.c | 1 |
7 files changed, 0 insertions, 45 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h deleted file mode 100644 index ba46416634f0..000000000000 --- a/arch/x86/include/asm/pda.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | #ifndef _ASM_X86_PDA_H | ||
2 | #define _ASM_X86_PDA_H | ||
3 | |||
4 | #ifndef __ASSEMBLY__ | ||
5 | #include <linux/stddef.h> | ||
6 | #include <linux/types.h> | ||
7 | #include <linux/cache.h> | ||
8 | #include <linux/threads.h> | ||
9 | #include <asm/page.h> | ||
10 | #include <asm/percpu.h> | ||
11 | |||
12 | /* Per processor datastructure. %gs points to it while the kernel runs */ | ||
13 | struct x8664_pda { | ||
14 | unsigned long unused1; | ||
15 | unsigned long unused2; | ||
16 | unsigned long unused3; | ||
17 | unsigned long unused4; | ||
18 | int unused5; | ||
19 | unsigned int unused6; /* 36 was cpunumber */ | ||
20 | short in_bootmem; /* pda lives in bootmem */ | ||
21 | } ____cacheline_aligned_in_smp; | ||
22 | |||
23 | DECLARE_PER_CPU(struct x8664_pda, __pda); | ||
24 | |||
25 | #define cpu_pda(cpu) (&per_cpu(__pda, cpu)) | ||
26 | |||
27 | #define read_pda(field) percpu_read(__pda.field) | ||
28 | #define write_pda(field, val) percpu_write(__pda.field, val) | ||
29 | #define add_pda(field, val) percpu_add(__pda.field, val) | ||
30 | #define sub_pda(field, val) percpu_sub(__pda.field, val) | ||
31 | #define or_pda(field, val) percpu_or(__pda.field, val) | ||
32 | |||
33 | /* This is not atomic against other CPUs -- CPU preemption needs to be off */ | ||
34 | #define test_and_clear_bit_pda(bit, field) \ | ||
35 | x86_test_and_clear_bit_percpu(bit, __pda.field) | ||
36 | |||
37 | #endif | ||
38 | |||
39 | #endif /* _ASM_X86_PDA_H */ | ||
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index ba09289accaa..1df9637dfda3 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
12 | #include <linux/bitops.h> | 12 | #include <linux/bitops.h> |
13 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
14 | #include <asm/pda.h> | ||
15 | 14 | ||
16 | extern pud_t level3_kernel_pgt[512]; | 15 | extern pud_t level3_kernel_pgt[512]; |
17 | extern pud_t level3_ident_pgt[512]; | 16 | extern pud_t level3_ident_pgt[512]; |
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 68636e767a91..45ef8a1b9d7c 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h | |||
@@ -15,7 +15,6 @@ | |||
15 | # include <asm/io_apic.h> | 15 | # include <asm/io_apic.h> |
16 | # endif | 16 | # endif |
17 | #endif | 17 | #endif |
18 | #include <asm/pda.h> | ||
19 | #include <asm/thread_info.h> | 18 | #include <asm/thread_info.h> |
20 | #include <asm/cpumask.h> | 19 | #include <asm/cpumask.h> |
21 | 20 | ||
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 94f9c8b39d20..8793ab33e2c1 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/hardirq.h> | 11 | #include <linux/hardirq.h> |
12 | #include <linux/suspend.h> | 12 | #include <linux/suspend.h> |
13 | #include <linux/kbuild.h> | 13 | #include <linux/kbuild.h> |
14 | #include <asm/pda.h> | ||
15 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
16 | #include <asm/segment.h> | 15 | #include <asm/segment.h> |
17 | #include <asm/thread_info.h> | 16 | #include <asm/thread_info.h> |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 098934e72a16..3887fcf6e519 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <asm/genapic.h> | 30 | #include <asm/genapic.h> |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #include <asm/pda.h> | ||
34 | #include <asm/pgtable.h> | 33 | #include <asm/pgtable.h> |
35 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
36 | #include <asm/desc.h> | 35 | #include <asm/desc.h> |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 088bc9a0f82c..c422eebb0c58 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <asm/processor.h> | 47 | #include <asm/processor.h> |
48 | #include <asm/i387.h> | 48 | #include <asm/i387.h> |
49 | #include <asm/mmu_context.h> | 49 | #include <asm/mmu_context.h> |
50 | #include <asm/pda.h> | ||
51 | #include <asm/prctl.h> | 50 | #include <asm/prctl.h> |
52 | #include <asm/desc.h> | 51 | #include <asm/desc.h> |
53 | #include <asm/proto.h> | 52 | #include <asm/proto.h> |
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 98c2d055284b..ed5aee5f3fcc 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #ifdef CONFIG_X86_64 | 59 | #ifdef CONFIG_X86_64 |
60 | #include <asm/pgalloc.h> | 60 | #include <asm/pgalloc.h> |
61 | #include <asm/proto.h> | 61 | #include <asm/proto.h> |
62 | #include <asm/pda.h> | ||
63 | #else | 62 | #else |
64 | #include <asm/processor-flags.h> | 63 | #include <asm/processor-flags.h> |
65 | #include <asm/arch_hooks.h> | 64 | #include <asm/arch_hooks.h> |