From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jun 2009 23:14:41 +0000 (-0700)
Subject: Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bec706838ec2f9c8c2b99e88a1270d7cba159b06;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'x86-setup-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: fix comment in the "glove box" code
  x86, setup: "glove box" BIOS interrupts in the video code
  x86, setup: "glove box" BIOS interrupts in the MCA code
  x86, setup: "glove box" BIOS interrupts in the EDD code
  x86, setup: "glove box" BIOS interrupts in the APM code
  x86, setup: "glove box" BIOS interrupts in the core boot code
  x86, setup: "glove box" BIOS calls -- infrastructure
---

bec706838ec2f9c8c2b99e88a1270d7cba159b06
diff --cc arch/x86/boot/header.S
index 1040f6e8010c,486d97fa7f4d..b31cc54b4641
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@@ -224,20 -219,9 +224,20 @@@ setup_data:		.quad 0			# 64-bit physica
  						# single linked list of
  						# struct setup_data
  
 +pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr
 +
 +#define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
 +#define VO_INIT_SIZE	(VO__end - VO__text)
 +#if ZO_INIT_SIZE > VO_INIT_SIZE
 +#define INIT_SIZE ZO_INIT_SIZE
 +#else
 +#define INIT_SIZE VO_INIT_SIZE
 +#endif
 +init_size:		.long INIT_SIZE		# kernel initialization size
 +
  # End of setup header #####################################################
  
- 	.section ".inittext", "ax"
+ 	.section ".entrytext", "ax"
  start_of_setup:
  #ifdef SAFE_RESET_DISK_CONTROLLER
  # Reset the disk controller.