aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pda.h39
-rw-r--r--arch/x86/include/asm/pgtable_64.h1
-rw-r--r--arch/x86/include/asm/smp.h1
3 files changed, 0 insertions, 41 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h
deleted file mode 100644
index ba46416634f..00000000000
--- 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 */
13struct 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
23DECLARE_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 ba09289acca..1df9637dfda 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
16extern pud_t level3_kernel_pgt[512]; 15extern pud_t level3_kernel_pgt[512];
17extern pud_t level3_ident_pgt[512]; 16extern pud_t level3_ident_pgt[512];
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 68636e767a9..45ef8a1b9d7 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