1 files changed, 0 insertions, 115 deletions
diff --git a/arch/x86/include/asm/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h
deleted file mode 100644
index 047d9bab2b31..000000000000
--- a/arch/x86/include/asm/fixmap_32.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * fixmap.h: compile-time virtual memory allocation
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1998 Ingo Molnar
- *
- * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
- */
-#ifndef _ASM_X86_FIXMAP_32_H
-#define _ASM_X86_FIXMAP_32_H
-/* used by vmalloc.c, vsyscall.lds.S.
- *
- * Leave one empty page between vmalloc'ed areas and
- * the start of the fixmap.
- */
-extern unsigned long __FIXADDR_TOP;
-#define FIXADDR_USER_START     __fix_to_virt(FIX_VDSO)
-#define FIXADDR_USER_END       __fix_to_virt(FIX_VDSO - 1)
-#ifndef __ASSEMBLY__
-#include <linux/kernel.h>
-#include <asm/acpi.h>
-#include <asm/apicdef.h>
-#include <asm/page.h>
-#include <linux/threads.h>
-#include <asm/kmap_types.h>
-/*
- * Here we define all the compile-time 'special' virtual
- * addresses. The point is to have a constant address at
- * compile time, but to set the physical address only
- * in the boot process. We allocate these special addresses
- * from the end of virtual memory (0xfffff000) backwards.
- * Also this lets us do fail-safe vmalloc(), we
- * can guarantee that these special addresses and
- * vmalloc()-ed addresses never overlap.
- *
- * these 'compile-time allocated' memory buffers are
- * fixed-size 4k pages. (or larger if used with an increment
- * highger than 1) use fixmap_set(idx,phys) to associate
- * physical memory with fixmap indices.
- *
- * TLB entries of such buffers will not be flushed across
- * task switches.
- */
-enum fixed_addresses {
-        FIX_HOLE,
-        FIX_VDSO,
-        FIX_DBGP_BASE,
-        FIX_EARLYCON_MEM_BASE,
-#ifdef CONFIG_X86_LOCAL_APIC
-        FIX_APIC_BASE,  /* local (CPU) APIC) -- required for SMP or not */
-#endif
-#ifdef CONFIG_X86_IO_APIC
-        FIX_IO_APIC_BASE_0,
-        FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
-#endif
-#ifdef CONFIG_X86_VISWS_APIC
-        FIX_CO_CPU,     /* Cobalt timer */
-        FIX_CO_APIC,    /* Cobalt APIC Redirection Table */
-        FIX_LI_PCIA,    /* Lithium PCI Bridge A */
-        FIX_LI_PCIB,    /* Lithium PCI Bridge B */
-#endif
-#ifdef CONFIG_X86_F00F_BUG
-        FIX_F00F_IDT,   /* Virtual mapping for IDT */
-#endif
-#ifdef CONFIG_X86_CYCLONE_TIMER
-        FIX_CYCLONE_TIMER, /*cyclone timer register*/
-#endif
-        FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
-        FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
-#ifdef CONFIG_PCI_MMCONFIG
-        FIX_PCIE_MCFG,
-#endif
-#ifdef CONFIG_PARAVIRT
-        FIX_PARAVIRT_BOOTMAP,
-#endif
-        __end_of_permanent_fixed_addresses,
-        /*
-         * 256 temporary boot-time mappings, used by early_ioremap(),
-         * before ioremap() is functional.
-         *
-         * We round it up to the next 256 pages boundary so that we
-         * can have a single pgd entry and a single pte table:
-         */
-#define NR_FIX_BTMAPS           64
-#define FIX_BTMAPS_SLOTS        4
-        FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
-                        (__end_of_permanent_fixed_addresses & 255),
-        FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
-        FIX_WP_TEST,
-#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
-        FIX_OHCI1394_BASE,
-#endif
-        __end_of_fixed_addresses
-};
-extern void reserve_top_address(unsigned long reserve);
-#define FIXADDR_TOP     ((unsigned long)__FIXADDR_TOP)
-#define __FIXADDR_SIZE  (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
-#define __FIXADDR_BOOT_SIZE     (__end_of_fixed_addresses << PAGE_SHIFT)
-#define FIXADDR_START           (FIXADDR_TOP - __FIXADDR_SIZE)
-#define FIXADDR_BOOT_START      (FIXADDR_TOP - __FIXADDR_BOOT_SIZE)
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_X86_FIXMAP_32_H */

diff --git a/arch/x86/include/asm/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h deleted file mode 100644 index 047d9bab2b31..000000000000 --- a/arch/x86/include/asm/fixmap_32.h +++ /dev/null
@@ -1,115 +0,0 @@
1	/*
2	* fixmap.h: compile-time virtual memory allocation
3	*
4	* This file is subject to the terms and conditions of the GNU General Public
5	* License. See the file "COPYING" in the main directory of this archive
6	* for more details.
7	*
8	* Copyright (C) 1998 Ingo Molnar
9	*
10	* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
11	*/
12
13	#ifndef _ASM_X86_FIXMAP_32_H
14	#define _ASM_X86_FIXMAP_32_H
15
16
17	/* used by vmalloc.c, vsyscall.lds.S.
18	*
19	* Leave one empty page between vmalloc'ed areas and
20	* the start of the fixmap.
21	*/
22	extern unsigned long __FIXADDR_TOP;
23	#define FIXADDR_USER_START __fix_to_virt(FIX_VDSO)
24	#define FIXADDR_USER_END __fix_to_virt(FIX_VDSO - 1)
25
26	#ifndef __ASSEMBLY__
27	#include <linux/kernel.h>
28	#include <asm/acpi.h>
29	#include <asm/apicdef.h>
30	#include <asm/page.h>
31	#include <linux/threads.h>
32	#include <asm/kmap_types.h>
33
34	/*
35	* Here we define all the compile-time 'special' virtual
36	* addresses. The point is to have a constant address at
37	* compile time, but to set the physical address only
38	* in the boot process. We allocate these special addresses
39	* from the end of virtual memory (0xfffff000) backwards.
40	* Also this lets us do fail-safe vmalloc(), we
41	* can guarantee that these special addresses and
42	* vmalloc()-ed addresses never overlap.
43	*
44	* these 'compile-time allocated' memory buffers are
45	* fixed-size 4k pages. (or larger if used with an increment
46	* highger than 1) use fixmap_set(idx,phys) to associate
47	* physical memory with fixmap indices.
48	*
49	* TLB entries of such buffers will not be flushed across
50	* task switches.
51	*/
52	enum fixed_addresses {
53	FIX_HOLE,
54	FIX_VDSO,
55	FIX_DBGP_BASE,
56	FIX_EARLYCON_MEM_BASE,
57	#ifdef CONFIG_X86_LOCAL_APIC
58	FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
59	#endif
60	#ifdef CONFIG_X86_IO_APIC
61	FIX_IO_APIC_BASE_0,
62	FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
63	#endif
64	#ifdef CONFIG_X86_VISWS_APIC
65	FIX_CO_CPU, /* Cobalt timer */
66	FIX_CO_APIC, /* Cobalt APIC Redirection Table */
67	FIX_LI_PCIA, /* Lithium PCI Bridge A */
68	FIX_LI_PCIB, /* Lithium PCI Bridge B */
69	#endif
70	#ifdef CONFIG_X86_F00F_BUG
71	FIX_F00F_IDT, /* Virtual mapping for IDT */
72	#endif
73	#ifdef CONFIG_X86_CYCLONE_TIMER
74	FIX_CYCLONE_TIMER, /cyclone timer register/
75	#endif
76	FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
77	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
78	#ifdef CONFIG_PCI_MMCONFIG
79	FIX_PCIE_MCFG,
80	#endif
81	#ifdef CONFIG_PARAVIRT
82	FIX_PARAVIRT_BOOTMAP,
83	#endif
84	__end_of_permanent_fixed_addresses,
85	/*
86	* 256 temporary boot-time mappings, used by early_ioremap(),
87	* before ioremap() is functional.
88	*
89	* We round it up to the next 256 pages boundary so that we
90	* can have a single pgd entry and a single pte table:
91	*/
92	#define NR_FIX_BTMAPS 64
93	#define FIX_BTMAPS_SLOTS 4
94	FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
95	(__end_of_permanent_fixed_addresses & 255),
96	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
97	FIX_WP_TEST,
98	#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
99	FIX_OHCI1394_BASE,
100	#endif
101	__end_of_fixed_addresses
102	};
103
104	extern void reserve_top_address(unsigned long reserve);
105
106
107	#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)
108
109	#define __FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
110	#define __FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
111	#define FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE)
112	#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE)
113
114	#endif /* !__ASSEMBLY__ */
115	#endif /* _ASM_X86_FIXMAP_32_H */