aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/setup.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2005-06-23 03:08:33 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:11 -0400
commit129f69465b411592247c408f93d7106939223be1 (patch)
treef585dff5c44ffdd0ee4ce05dec56dbc8477eb909 /arch/i386/kernel/setup.c
parenta9ed8817966dd723754a990f1003264a21b5747e (diff)
[PATCH] Remove i386_ksyms.c, almost.
* EXPORT_SYMBOL's moved to other files * #include <linux/config.h>, <linux/module.h> where needed * #include's in i386_ksyms.c cleaned up * After copy-paste, redundant due to Makefiles rules preprocessor directives removed: #ifdef CONFIG_FOO EXPORT_SYMBOL(foo); #endif obj-$(CONFIG_FOO) += foo.o * Tiny reformat to fit in 80 columns Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r--arch/i386/kernel/setup.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 0d689335c8d..30406fd0b64 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -23,6 +23,7 @@
23 * This file handles the architecture-dependent parts of initialization 23 * This file handles the architecture-dependent parts of initialization
24 */ 24 */
25 25
26#include <linux/config.h>
26#include <linux/sched.h> 27#include <linux/sched.h>
27#include <linux/mm.h> 28#include <linux/mm.h>
28#include <linux/mmzone.h> 29#include <linux/mmzone.h>
@@ -74,6 +75,7 @@ EXPORT_SYMBOL(efi_enabled);
74struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; 75struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
75/* common cpu data for all cpus */ 76/* common cpu data for all cpus */
76struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; 77struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
78EXPORT_SYMBOL(boot_cpu_data);
77 79
78unsigned long mmu_cr4_features; 80unsigned long mmu_cr4_features;
79 81
@@ -91,12 +93,18 @@ extern acpi_interrupt_flags acpi_sci_flags;
91 93
92/* for MCA, but anyone else can use it if they want */ 94/* for MCA, but anyone else can use it if they want */
93unsigned int machine_id; 95unsigned int machine_id;
96#ifdef CONFIG_MCA
97EXPORT_SYMBOL(machine_id);
98#endif
94unsigned int machine_submodel_id; 99unsigned int machine_submodel_id;
95unsigned int BIOS_revision; 100unsigned int BIOS_revision;
96unsigned int mca_pentium_flag; 101unsigned int mca_pentium_flag;
97 102
98/* For PCI or other memory-mapped resources */ 103/* For PCI or other memory-mapped resources */
99unsigned long pci_mem_start = 0x10000000; 104unsigned long pci_mem_start = 0x10000000;
105#ifdef CONFIG_PCI
106EXPORT_SYMBOL(pci_mem_start);
107#endif
100 108
101/* Boot loader ID as an integer, for the benefit of proc_dointvec */ 109/* Boot loader ID as an integer, for the benefit of proc_dointvec */
102int bootloader_type; 110int bootloader_type;
@@ -108,14 +116,26 @@ static unsigned int highmem_pages = -1;
108 * Setup options 116 * Setup options
109 */ 117 */
110struct drive_info_struct { char dummy[32]; } drive_info; 118struct drive_info_struct { char dummy[32]; } drive_info;
119#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) || \
120 defined(CONFIG_BLK_DEV_IDE_MODULE) || defined(CONFIG_BLK_DEV_HD_MODULE)
121EXPORT_SYMBOL(drive_info);
122#endif
111struct screen_info screen_info; 123struct screen_info screen_info;
124#ifdef CONFIG_VT
125EXPORT_SYMBOL(screen_info);
126#endif
112struct apm_info apm_info; 127struct apm_info apm_info;
128EXPORT_SYMBOL(apm_info);
113struct sys_desc_table_struct { 129struct sys_desc_table_struct {
114 unsigned short length; 130 unsigned short length;
115 unsigned char table[0]; 131 unsigned char table[0];
116}; 132};
117struct edid_info edid_info; 133struct edid_info edid_info;
118struct ist_info ist_info; 134struct ist_info ist_info;
135#if defined(CONFIG_X86_SPEEDSTEP_SMI) || \
136 defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
137EXPORT_SYMBOL(ist_info);
138#endif
119struct e820map e820; 139struct e820map e820;
120 140
121extern void early_cpu_init(void); 141extern void early_cpu_init(void);