diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 2367ae07eb76..319b08a5b6ed 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -146,31 +146,6 @@ int default_check_phys_apicid_present(int phys_apicid) | |||
146 | 146 | ||
147 | struct boot_params boot_params; | 147 | struct boot_params boot_params; |
148 | 148 | ||
149 | /* | ||
150 | * Machine setup.. | ||
151 | */ | ||
152 | static struct resource data_resource = { | ||
153 | .name = "Kernel data", | ||
154 | .start = 0, | ||
155 | .end = 0, | ||
156 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM | ||
157 | }; | ||
158 | |||
159 | static struct resource code_resource = { | ||
160 | .name = "Kernel code", | ||
161 | .start = 0, | ||
162 | .end = 0, | ||
163 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM | ||
164 | }; | ||
165 | |||
166 | static struct resource bss_resource = { | ||
167 | .name = "Kernel bss", | ||
168 | .start = 0, | ||
169 | .end = 0, | ||
170 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM | ||
171 | }; | ||
172 | |||
173 | |||
174 | #ifdef CONFIG_X86_32 | 149 | #ifdef CONFIG_X86_32 |
175 | /* cpu data as detected by the assembly code in head.S */ | 150 | /* cpu data as detected by the assembly code in head.S */ |
176 | struct cpuinfo_x86 new_cpu_data = { | 151 | struct cpuinfo_x86 new_cpu_data = { |
@@ -949,13 +924,6 @@ void __init setup_arch(char **cmdline_p) | |||
949 | 924 | ||
950 | mpx_mm_init(&init_mm); | 925 | mpx_mm_init(&init_mm); |
951 | 926 | ||
952 | code_resource.start = __pa_symbol(_text); | ||
953 | code_resource.end = __pa_symbol(_etext)-1; | ||
954 | data_resource.start = __pa_symbol(_etext); | ||
955 | data_resource.end = __pa_symbol(_edata)-1; | ||
956 | bss_resource.start = __pa_symbol(__bss_start); | ||
957 | bss_resource.end = __pa_symbol(__bss_stop)-1; | ||
958 | |||
959 | #ifdef CONFIG_CMDLINE_BOOL | 927 | #ifdef CONFIG_CMDLINE_BOOL |
960 | #ifdef CONFIG_CMDLINE_OVERRIDE | 928 | #ifdef CONFIG_CMDLINE_OVERRIDE |
961 | strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); | 929 | strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); |
@@ -1019,11 +987,6 @@ void __init setup_arch(char **cmdline_p) | |||
1019 | 987 | ||
1020 | x86_init.resources.probe_roms(); | 988 | x86_init.resources.probe_roms(); |
1021 | 989 | ||
1022 | /* after parse_early_param, so could debug it */ | ||
1023 | insert_resource(&iomem_resource, &code_resource); | ||
1024 | insert_resource(&iomem_resource, &data_resource); | ||
1025 | insert_resource(&iomem_resource, &bss_resource); | ||
1026 | |||
1027 | e820_add_kernel_range(); | 990 | e820_add_kernel_range(); |
1028 | trim_bios_range(); | 991 | trim_bios_range(); |
1029 | #ifdef CONFIG_X86_32 | 992 | #ifdef CONFIG_X86_32 |