Commit 94916301 authored by Paolo Pisati's avatar Paolo Pisati Committed by Ingo Molnar
Browse files

x86/boot: Obsolete the MCA sys_desc_table 



The kernel does not support the MCA bus anymroe, so mark sys_desc_table
as obsolete: remove any reference from the code together with the remaining
of MCA logic.

bloat-o-meter output:

  add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-55 (-55)
  function                                     old     new   delta
  i386_start_kernel                            128     119      -9
  setup_arch                                  1421    1375     -46

Signed-off-by: default avatarPaolo Pisati <p.pisati@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1437409430-8491-1-git-send-email-p.pisati@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 79063a7c

Documentation/x86/zero-page.txt

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Offset Proto Name Meaning 
				(struct ist_info)

080/010	ALL	hd0_info	hd0 disk parameter, OBSOLETE!!

090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table)

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table),

				OBSOLETE!!

0B0/010	ALL	olpc_ofw_header	OLPC's OpenFirmware CIF and friends

0C0/004	ALL	ext_ramdisk_image ramdisk_image high 32bits

0C4/004	ALL	ext_ramdisk_size  ramdisk_size high 32bits

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ targets += fdimage fdimage144 fdimage288 image.iso mtools.conf 
subdir-		:= compressed



setup-y		+= a20.o bioscall.o cmdline.o copy.o cpu.o cpuflags.o cpucheck.o

setup-y		+= early_serial_console.o edd.o header.o main.o mca.o memory.o

setup-y		+= early_serial_console.o edd.o header.o main.o memory.o

setup-y		+= pm.o pmjump.o printf.o regs.o string.o tty.o video.o

setup-y		+= video-mode.o version.o

setup-$(CONFIG_X86_APM_BOOT) += apm.o

arch/x86/boot/boot.h

+0 −3
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ void query_edd(void); 
/* header.S */

void __attribute__((noreturn)) die(void);



/* mca.c */

int query_mca(void);



/* memory.c */

int detect_memory(void);

arch/x86/boot/compressed/eboot.c

+0 −4
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ void setup_graphics(struct boot_params *boot_params) 
struct boot_params *make_boot_params(struct efi_config *c)

{

	struct boot_params *boot_params;

	struct sys_desc_table *sdt;

	struct apm_bios_info *bi;

	struct setup_header *hdr;

	struct efi_info *efi;
@@ -1089,7 +1088,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	hdr = &boot_params->hdr;

	efi = &boot_params->efi_info;

	bi = &boot_params->apm_bios_info;

	sdt = &boot_params->sys_desc_table;



	/* Copy the second sector to boot_params */

	memcpy(&hdr->jump, image->image_base + 512, 512);
@@ -1118,8 +1116,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	/* Clear APM BIOS info */

	memset(bi, 0, sizeof(*bi));



	memset(sdt, 0, sizeof(*sdt));



	status = efi_parse_options(cmdline_ptr);

	if (status != EFI_SUCCESS)

		goto fail2;

arch/x86/boot/main.c

+0 −3
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ void main(void) 
	/* Set keyboard repeat rate (why?) and query the lock flags */

	keyboard_init();



	/* Query MCA information */

	query_mca();



	/* Query Intel SpeedStep (IST) information */

	query_ist();

CRA Git | Maintained and supported by SUSTech CRA and CCSE