rpms/kernel/F-7 stable-reverts.patch, NONE, 1.1 kernel-2.6.spec, 1.3206, 1.3207 linux-2.6-compile-fixes.patch, 1.149, 1.150

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18273

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Added Files:
	stable-reverts.patch 
Log Message:
* Mon May 28 2007 Dave Jones <davej at redhat.com>
- Apply 2.6.21.2 & .3 again. Revert suspect #1.


stable-reverts.patch:

--- NEW FILE stable-reverts.patch ---
>From davej  Mon May 21 15:21:31 2007
Return-Path: <chrisw at sous-sol.org>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-102.7 required=5.0 tests=AWL,BAYES_00,
	UNPARSEABLE_RELAY,USER_IN_WHITELIST autolearn=ham version=3.1.8
Received: from pobox.devel.redhat.com [10.11.255.8]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
	for <davej at localhost> (single-drop); Mon, 21 May 2007 15:21:31 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
	 Mon, 21 May 2007 15:21:10 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l4LJLAZY021642
	for <davej at pobox.devel.redhat.com>; Mon, 21 May 2007 15:21:10 -0400
Received: from sous-sol.org (vpn-248-39.boston.redhat.com [10.13.248.39])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4LJL8XM012486;
	Mon, 21 May 2007 15:21:09 -0400
Received: from sous-sol.org (localhost.localdomain [127.0.0.1])
	by sous-sol.org (8.14.1/8.13.7) with ESMTP id l4LJGx5c029628;
	Mon, 21 May 2007 12:16:59 -0700
Received: (from chrisw at localhost)
	by sous-sol.org (8.14.1/8.14.1/Submit) id l4LJGxGk029627;
	Mon, 21 May 2007 12:16:59 -0700
Message-Id: <20070521191659.548011000 at sous-sol.org>
References: <20070521191612.800400000 at sous-sol.org>
User-Agent: quilt/0.46-1
Date: Mon, 21 May 2007 12:16:16 -0700
From: Chris Wright <chrisw at sous-sol.org>
To: linux-kernel at vger.kernel.org, stable at kernel.org
Cc: Justin Forbes <jmforbes at linuxtx.org>,
        Zwane Mwaikambo <zwane at arm.linux.org.uk>,
        "Theodore Ts'o" <tytso at mit.edu>, Randy Dunlap <rdunlap at xenotime.net>,
        Dave Jones <davej at redhat.com>, Chuck Wolber <chuckw at quantumlinux.com>,
        Chris Wedgwood <reviews at ml.cw.f00f.org>,
        Michael Krufky <mkrufky at linuxtv.org>,
        Chuck Ebbert <cebbert at redhat.com>, torvalds at linux-foundation.org,
        akpm at linux-foundation.org, alan at lxorguk.ukuu.org.uk,
        Len Brown <lenb at kernel.org>, linux-acpi at vger.kernel.org,
        Len Brown <len.brown at intel.com>
Subject: [patch 04/69] ACPI: Fix 2.6.21 boot regression on P4/HT
Content-Disposition: inline; filename=acpi-fix-2.6.21-boot-regression-on-p4-ht.patch
X-Virus-Scanned: ClamAV version 0.90.2, clamav-milter version 0.90.2 on sequoia.sous-sol.org
X-Virus-Status: Clean
Status: RO
Content-Length: 1484
Lines: 45

-stable review patch.  If anyone has any objections, please let us know.
---------------------

From: Len Brown <lenb at kernel.org>

Up through 2.6.20 we cleared the FADT.CSTATE_CONTROL field
for FADT versions before r3, because it made no sense
for that reserved field to be set for pre-ACPI 2.0 systems.

It turns out that not clearing this field exposes
Linux to SMM BIOS failures, so do the same in 2.6.21.

http://bugzilla.kernel.org/show_bug.cgi?id=8346

Signed-off-by: Len Brown <len.brown at intel.com>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
---
 drivers/acpi/tables/tbfadt.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- linux-2.6.21.1.orig/drivers/acpi/tables/tbfadt.c
+++ linux-2.6.21.1/drivers/acpi/tables/tbfadt.c
@@ -347,6 +347,20 @@ static void acpi_tb_convert_fadt(void)
 		acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
 
 	}
+	/*
+	 * _CST object and C States change notification start with
+	 * ACPI 2.0 (FADT r3).  Although the field should be Reserved
+	 * and 0 before then, some pre-r3 FADT set this field and
+	 * it results in SMM-related boot failures.  For them, clear it.
+	 */
+	if ((acpi_gbl_FADT.header.revision < 3) &&
+		(acpi_gbl_FADT.cst_control != 0)) {
+			ACPI_WARNING((AE_INFO,
+				"Ignoring BIOS FADT r%u C-state control",
+				acpi_gbl_FADT.header.revision));
+		 	acpi_gbl_FADT.cst_control = 0;
+	}
+
 }
 
 /******************************************************************************

-- 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3206
retrieving revision 1.3207
diff -u -r1.3206 -r1.3207
--- kernel-2.6.spec	27 May 2007 22:46:22 -0000	1.3206
+++ kernel-2.6.spec	28 May 2007 04:16:53 -0000	1.3207
@@ -396,6 +396,7 @@
 #
 Patch1: patch-2.6.21.2.bz2
 Patch2: linux-2.6-21.3.patch
+Patch3: stable-reverts.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1056,8 +1057,9 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-#%patch1 -p1
-#%patch2 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1 -R
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1472,7 +1474,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-%patch10000 -p1
+#%patch10000 -p1
 %patch10001 -p1
 %patch10002 -p1
 %patch10003 -p1
@@ -2428,6 +2430,9 @@
 %endif
 
 %changelog
+* Mon May 28 2007 Dave Jones <davej at redhat.com>
+- Apply 2.6.21.2 & .3 again. Revert suspect #1.
+
 * Sun May 27 2007 Dave Jones <davej at redhat.com>
 - Downgrade to 2.6.21 (test build to root cause the Dell hang).
 

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-compile-fixes.patch,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- linux-2.6-compile-fixes.patch	27 May 2007 22:02:04 -0000	1.149
+++ linux-2.6-compile-fixes.patch	28 May 2007 04:16:53 -0000	1.150
@@ -5,59 +5,4 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
-index b2a3b19..ce547af 100644
---- a/drivers/net/sis900.c
-+++ b/drivers/net/sis900.c
-@@ -1754,6 +1754,7 @@ static int sis900_rx(struct net_device *net_dev)
- 			sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
- 		} else {
- 			struct sk_buff * skb;
-+			struct sk_buff * rx_skb;
- 
- 			pci_unmap_single(sis_priv->pci_dev,
- 				sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE,
-@@ -1787,10 +1788,10 @@ static int sis900_rx(struct net_device *net_dev)
- 			}
- 
- 			/* give the socket buffer to upper layers */
--			skb = sis_priv->rx_skbuff[entry];
--			skb_put(skb, rx_size);
--			skb->protocol = eth_type_trans(skb, net_dev);
--			netif_rx(skb);
-+			rx_skb = sis_priv->rx_skbuff[entry];
-+			skb_put(rx_skb, rx_size);
-+			rx_skb->protocol = eth_type_trans(rx_skb, net_dev);
-+			netif_rx(rx_skb);
- 
- 			/* some network statistics */
- 			if ((rx_status & BCAST) == MCAST)
-diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
-index daa4940..bf92c26 100644
---- a/include/linux/clocksource.h
-+++ b/include/linux/clocksource.h
-@@ -48,6 +48,7 @@ struct clocksource;
-  * @shift:		cycle to nanosecond divisor (power of two)
-  * @flags:		flags describing special properties
-  * @vread:		vsyscall based read
-+ * @resume:		resume function for the clocksource, if necessary
-  * @cycle_interval:	Used internally by timekeeping core, please ignore.
-  * @xtime_interval:	Used internally by timekeeping core, please ignore.
-  */
-@@ -61,6 +62,7 @@ struct clocksource {
- 	u32 shift;
- 	unsigned long flags;
- 	cycle_t (*vread)(void);
-+	void (*resume)(void);
- 
- 	/* timekeeping specific data, ignore */
- 	cycle_t cycle_last, cycle_interval;
-@@ -198,6 +200,7 @@ static inline void clocksource_calculate_interval(struct clocksource *c,
- extern int clocksource_register(struct clocksource*);
- extern struct clocksource* clocksource_get_next(void);
- extern void clocksource_change_rating(struct clocksource *cs, int rating);
-+extern void clocksource_resume(void);
- 
- #ifdef CONFIG_GENERIC_TIME_VSYSCALL
- extern void update_vsyscall(struct timespec *ts, struct clocksource *c);