From ae9c0b811eb3c3d9fd211492bf822faf1dfac872 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 20 Jul 2007 22:36:56 +0200
Subject: [PATCH] --- yaml --- r: 62919 b: refs/heads/master c:
 8d8d8289df65cb116d2721becafb37272074f25a h: refs/heads/master i:   62917:
 a86fa2f3ffb152dd84e30bcc9fdbfe5f34f94193   62915:
 d4f25a5b88716a16078b2f9e26808220c4391b46   62911:
 00e8fd39224dba3e43c806469169d3909d05067b v: v3

---
 [refs]                             |  2 +-
 trunk/arch/i386/boot/apm.c         |  7 +++----
 trunk/arch/i386/boot/main.c        | 16 ++++++++--------
 trunk/include/asm-i386/bootparam.h |  9 ++++-----
 trunk/include/asm-i386/ist.h       | 10 ++++------
 trunk/include/asm-x86_64/ist.h     |  1 -
 trunk/include/linux/apm_bios.h     | 20 +++++++++-----------
 trunk/scripts/Makefile.modpost     | 19 ++++++++++---------
 trunk/scripts/mod/modpost.c        | 13 ++++++++++---
 9 files changed, 49 insertions(+), 48 deletions(-)
 delete mode 100644 trunk/include/asm-x86_64/ist.h

diff --git a/[refs] b/[refs]
index 3f30fb79b4ff..991aaf476267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bf3b0bc3e98f77de88b336fd8d673649601b557
+refs/heads/master: 8d8d8289df65cb116d2721becafb37272074f25a
diff --git a/trunk/arch/i386/boot/apm.c b/trunk/arch/i386/boot/apm.c
index eab50c55a3a5..a34087c370c0 100644
--- a/trunk/arch/i386/boot/apm.c
+++ b/trunk/arch/i386/boot/apm.c
@@ -40,15 +40,14 @@ int query_apm_bios(void)
 	if (bx != 0x504d)	/* "PM" signature */
 		return -1;
 
-	if (!(cx & 0x02))		/* 32 bits supported? */
+	if (cx & 0x02)		/* 32 bits supported? */
 		return -1;
 
 	/* Disconnect first, just in case */
 	ax = 0x5304;
-	bx = 0;
 	asm volatile("pushl %%ebp ; int $0x15 ; popl %%ebp"
-		     : "+a" (ax), "+b" (bx)
-		     : : "ecx", "edx", "esi", "edi");
+		     : "+a" (ax)
+		     : : "ebx", "ecx", "edx", "esi", "edi");
 
 	/* Paranoia */
 	ebx = esi = 0;
diff --git a/trunk/arch/i386/boot/main.c b/trunk/arch/i386/boot/main.c
index 0eeef3989a17..7f01f96c4fb8 100644
--- a/trunk/arch/i386/boot/main.c
+++ b/trunk/arch/i386/boot/main.c
@@ -73,15 +73,15 @@ static void keyboard_set_repeat(void)
 }
 
 /*
- * Get Intel SpeedStep (IST) information.
+ * Get Intel SpeedStep IST information.
  */
-static void query_ist(void)
+static void query_speedstep_ist(void)
 {
 	asm("int $0x15"
-	    : "=a" (boot_params.ist_info.signature),
-	      "=b" (boot_params.ist_info.command),
-	      "=c" (boot_params.ist_info.event),
-	      "=d" (boot_params.ist_info.perf_level)
+	    : "=a" (boot_params.speedstep_info[0]),
+	      "=b" (boot_params.speedstep_info[1]),
+	      "=c" (boot_params.speedstep_info[2]),
+	      "=d" (boot_params.speedstep_info[3])
 	    : "a" (0x0000e980),	 /* IST Support */
 	      "d" (0x47534943)); /* Request value */
 }
@@ -144,8 +144,8 @@ void main(void)
 	query_voyager();
 #endif
 
-	/* Query Intel SpeedStep (IST) information */
-	query_ist();
+	/* Query SpeedStep IST information */
+	query_speedstep_ist();
 
 	/* Query APM information */
 #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
diff --git a/trunk/include/asm-i386/bootparam.h b/trunk/include/asm-i386/bootparam.h
index b91b01783e4b..427d8652bfde 100644
--- a/trunk/include/asm-i386/bootparam.h
+++ b/trunk/include/asm-i386/bootparam.h
@@ -4,9 +4,8 @@
 #include <linux/types.h>
 #include <linux/screen_info.h>
 #include <linux/apm_bios.h>
-#include <linux/edd.h>
 #include <asm/e820.h>
-#include <asm/ist.h>
+#include <linux/edd.h>
 #include <video/edid.h>
 
 struct setup_header {
@@ -49,9 +48,9 @@ struct efi_info {
 	u32 _pad1;
 	u32 efi_systab;
 	u32 efi_memdesc_size;
-	u32 efi_memdesc_version;
+	u32 efi_memdec_version;
 	u32 efi_memmap;
-	u32 efi_memmap_size;
+	u32 fi_memmap_size;
 	u32 _pad2[2];
 };
 
@@ -60,7 +59,7 @@ struct boot_params {
 	struct screen_info screen_info;			/* 0x000 */
 	struct apm_bios_info apm_bios_info;		/* 0x040 */
 	u8  _pad2[12];					/* 0x054 */
-	struct ist_info ist_info;			/* 0x060 */
+	u32 speedstep_info[4];				/* 0x060 */
 	u8  _pad3[16];					/* 0x070 */
 	u8  hd0_info[16];	/* obsolete! */		/* 0x080 */
 	u8  hd1_info[16];	/* obsolete! */		/* 0x090 */
diff --git a/trunk/include/asm-i386/ist.h b/trunk/include/asm-i386/ist.h
index ef2003ebc6f9..d13d1e68afa9 100644
--- a/trunk/include/asm-i386/ist.h
+++ b/trunk/include/asm-i386/ist.h
@@ -19,13 +19,11 @@
 
 #ifdef __KERNEL__
 
-#include <linux/types.h>
-
 struct ist_info {
-	u32 signature;
-	u32 command;
-	u32 event;
-	u32 perf_level;
+	unsigned long	signature;
+	unsigned long	command;
+	unsigned long	event;
+	unsigned long	perf_level;
 };
 
 extern struct ist_info ist_info;
diff --git a/trunk/include/asm-x86_64/ist.h b/trunk/include/asm-x86_64/ist.h
deleted file mode 100644
index 338857ecbc68..000000000000
--- a/trunk/include/asm-x86_64/ist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/ist.h>
diff --git a/trunk/include/linux/apm_bios.h b/trunk/include/linux/apm_bios.h
index 5f921c84827a..290aef326812 100644
--- a/trunk/include/linux/apm_bios.h
+++ b/trunk/include/linux/apm_bios.h
@@ -21,22 +21,20 @@ typedef unsigned short	apm_eventinfo_t;
 
 #ifdef __KERNEL__
 
-#include <linux/types.h>
-
 #define APM_CS		(GDT_ENTRY_APMBIOS_BASE * 8)
 #define APM_CS_16	(APM_CS + 8)
 #define APM_DS		(APM_CS_16 + 8)
 
 struct apm_bios_info {
-	u16	version;
-	u16	cseg;
-	u32	offset;
-	u16	cseg_16;
-	u16	dseg;
-	u16	flags;
-	u16	cseg_len;
-	u16	cseg_16_len;
-	u16	dseg_len;
+	unsigned short	version;
+	unsigned short	cseg;
+	unsigned long	offset;
+	unsigned short	cseg_16;
+	unsigned short	dseg;
+	unsigned short	flags;
+	unsigned short	cseg_len;
+	unsigned short	cseg_16_len;
+	unsigned short	dseg_len;
 };
 
 /* Results of APM Installation Check */
diff --git a/trunk/scripts/Makefile.modpost b/trunk/scripts/Makefile.modpost
index c6fcc597b3be..1818c502007e 100644
--- a/trunk/scripts/Makefile.modpost
+++ b/trunk/scripts/Makefile.modpost
@@ -56,23 +56,24 @@ _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules))
 
 # Step 2), invoke modpost
 #  Includes step 3,4
+modpost = scripts/mod/modpost                    \
+ $(if $(CONFIG_MODVERSIONS),-m)                  \
+ $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)       \
+ $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)   \
+ $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \
+ $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
+ $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
+
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = scripts/mod/modpost            \
-        $(if $(CONFIG_MODVERSIONS),-m)             \
-	$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)  \
-	$(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
-	$(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
-	$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
-	$(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
+      cmd_modpost = $(modpost) -s
 
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
 	$(call cmd,modpost) $(wildcard vmlinux) $(filter-out FORCE,$^)
 
 quiet_cmd_kernel-mod = MODPOST $@
-      cmd_kernel-mod = $(cmd_modpost) $@
+      cmd_kernel-mod = $(modpost) $@
 
-PHONY += vmlinux
 vmlinux.o: FORCE
 	$(call cmd,kernel-mod)
 
diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c
index 5ab7914d30ef..87e3ee56e87d 100644
--- a/trunk/scripts/mod/modpost.c
+++ b/trunk/scripts/mod/modpost.c
@@ -23,6 +23,8 @@ int have_vmlinux = 0;
 static int all_versions = 0;
 /* If we are modposting external module set to 1 */
 static int external_module = 0;
+/* Warn about section mismatch in vmlinux if set to 1 */
+static int vmlinux_section_warnings = 1;
 /* Only warn about unresolved symbols */
 static int warn_unresolved = 0;
 /* How a symbol is exported */
@@ -1257,8 +1259,10 @@ static void read_symbols(char *modname)
 		handle_modversions(mod, &info, sym, symname);
 		handle_moddevtable(mod, &info, sym, symname);
 	}
-	check_sec_ref(mod, modname, &info, init_section, init_section_ref_ok);
-	check_sec_ref(mod, modname, &info, exit_section, exit_section_ref_ok);
+	if (is_vmlinux(modname) && vmlinux_section_warnings) {
+		check_sec_ref(mod, modname, &info, init_section, init_section_ref_ok);
+		check_sec_ref(mod, modname, &info, exit_section, exit_section_ref_ok);
+	}
 
 	version = get_modinfo(info.modinfo, info.modinfo_len, "version");
 	if (version)
@@ -1626,7 +1630,7 @@ int main(int argc, char **argv)
 	int opt;
 	int err;
 
-	while ((opt = getopt(argc, argv, "i:I:mo:aw")) != -1) {
+	while ((opt = getopt(argc, argv, "i:I:mso:aw")) != -1) {
 		switch(opt) {
 			case 'i':
 				kernel_read = optarg;
@@ -1644,6 +1648,9 @@ int main(int argc, char **argv)
 			case 'a':
 				all_versions = 1;
 				break;
+			case 's':
+				vmlinux_section_warnings = 0;
+				break;
 			case 'w':
 				warn_unresolved = 1;
 				break;