diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-06-23 03:08:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:11 -0400 |
commit | 129f69465b411592247c408f93d7106939223be1 (patch) | |
tree | f585dff5c44ffdd0ee4ce05dec56dbc8477eb909 /arch/i386/kernel/setup.c | |
parent | a9ed8817966dd723754a990f1003264a21b5747e (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.c | 20 |
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); | |||
74 | struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; | 75 | struct 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 */ |
76 | struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; | 77 | struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; |
78 | EXPORT_SYMBOL(boot_cpu_data); | ||
77 | 79 | ||
78 | unsigned long mmu_cr4_features; | 80 | unsigned 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 */ |
93 | unsigned int machine_id; | 95 | unsigned int machine_id; |
96 | #ifdef CONFIG_MCA | ||
97 | EXPORT_SYMBOL(machine_id); | ||
98 | #endif | ||
94 | unsigned int machine_submodel_id; | 99 | unsigned int machine_submodel_id; |
95 | unsigned int BIOS_revision; | 100 | unsigned int BIOS_revision; |
96 | unsigned int mca_pentium_flag; | 101 | unsigned int mca_pentium_flag; |
97 | 102 | ||
98 | /* For PCI or other memory-mapped resources */ | 103 | /* For PCI or other memory-mapped resources */ |
99 | unsigned long pci_mem_start = 0x10000000; | 104 | unsigned long pci_mem_start = 0x10000000; |
105 | #ifdef CONFIG_PCI | ||
106 | EXPORT_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 */ |
102 | int bootloader_type; | 110 | int bootloader_type; |
@@ -108,14 +116,26 @@ static unsigned int highmem_pages = -1; | |||
108 | * Setup options | 116 | * Setup options |
109 | */ | 117 | */ |
110 | struct drive_info_struct { char dummy[32]; } drive_info; | 118 | struct 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) | ||
121 | EXPORT_SYMBOL(drive_info); | ||
122 | #endif | ||
111 | struct screen_info screen_info; | 123 | struct screen_info screen_info; |
124 | #ifdef CONFIG_VT | ||
125 | EXPORT_SYMBOL(screen_info); | ||
126 | #endif | ||
112 | struct apm_info apm_info; | 127 | struct apm_info apm_info; |
128 | EXPORT_SYMBOL(apm_info); | ||
113 | struct sys_desc_table_struct { | 129 | struct sys_desc_table_struct { |
114 | unsigned short length; | 130 | unsigned short length; |
115 | unsigned char table[0]; | 131 | unsigned char table[0]; |
116 | }; | 132 | }; |
117 | struct edid_info edid_info; | 133 | struct edid_info edid_info; |
118 | struct ist_info ist_info; | 134 | struct ist_info ist_info; |
135 | #if defined(CONFIG_X86_SPEEDSTEP_SMI) || \ | ||
136 | defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) | ||
137 | EXPORT_SYMBOL(ist_info); | ||
138 | #endif | ||
119 | struct e820map e820; | 139 | struct e820map e820; |
120 | 140 | ||
121 | extern void early_cpu_init(void); | 141 | extern void early_cpu_init(void); |