Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Mon Sep 28 17:23:13 CEST 2009.
--------
--- kernel-source/kernel-debug.changes 2009-09-16 04:05:26.000000000 +0200
+++ kernel-source/kernel-debug.changes 2009-09-24 04:05:26.000000000 +0200
@@ -1,0 +2,57 @@
+Wed Sep 23 13:29:27 CEST 2009 - teheo@suse.de
+
+- Update config files. Build pci-stub driver into the kernel so that
+ built in pci drivers can be blocked from attaching to devices.
+
+-------------------------------------------------------------------
+Tue Sep 22 12:14:52 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-module-subpackage: when building against Linus'
+ kernels (2.6.x), append a .0 to the kernel version embedded in
+ the KMP version, to ensure that such KMP is older than a KMP
+ built against a subsequent stable kernel (2.6.x.y, y > 0).
+
+-------------------------------------------------------------------
+Mon Sep 21 20:39:57 CEST 2009 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Sep 21 20:20:11 CEST 2009 - jeffm@suse.de
+
+- patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch: Ported to
+ 2.6.31 (bnc#533555).
+
+-------------------------------------------------------------------
+Sat Sep 19 13:51:50 CEST 2009 - mmarek@suse.cz
+
+- rpm/postun.sh: do not remove the bootloader entry if the kernel
+ version didn't change (bnc#533766).
+
+-------------------------------------------------------------------
+Sat Sep 19 13:39:38 CEST 2009 - mmarek@suse.cz
+
+- rpm/postun.sh: remove dead code.
+
+-------------------------------------------------------------------
+Thu Sep 17 21:25:23 CEST 2009 - jeffm@suse.de
+
+- patches.arch/acpi_srat-pxm-rev-ia64.patch: Use SRAT table rev
+ to use 8bit or 16/32bit PXM fields (ia64) (bnc#503038).
+- patches.arch/acpi_srat-pxm-rev-store.patch: Store SRAT table
+ revision (bnc#503038).
+- patches.arch/acpi_srat-pxm-rev-x86-64.patch: Use SRAT table
+ rev to use 8bit or 32bit PXM fields (x86-64) (bnc#503038).
+
+-------------------------------------------------------------------
+Thu Sep 17 21:08:15 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-2.6.32-rc1: ALSA HD-audio backport
+ from 2.6.32-rc1.
+
+-------------------------------------------------------------------
+Wed Sep 16 15:33:05 CEST 2009 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.31 final.
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:46.000000000 +0200
@@ -49,7 +49,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.31
-Release: 8
+Release: 9
%if %using_buildservice
%else
%endif
kernel-default.spec: same change
kernel-desktop.spec: same change
kernel-kdump.spec: same change
kernel-pae.spec: same change
kernel-ppc64.spec: same change
kernel-ps3.spec: same change
kernel-s390.spec: same change
kernel-source.spec: same change
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200
@@ -23,7 +23,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.31
-Release: 8
+Release: 9
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200
@@ -49,7 +49,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.31
-Release: 8
+Release: 9
%if %using_buildservice
%else
%endif
kernel-vanilla.spec: same change
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:47.000000000 +0200
@@ -49,7 +49,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.31
-Release: 7
+Release: 8
%if %using_buildservice
%else
%endif
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/debug 2009-09-23 13:30:39.000000000 +0200
@@ -443,6 +443,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -531,7 +532,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
CONFIG_PCI_DEBUG=y
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default
--- old/config/i386/default 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/default 2009-09-23 13:30:39.000000000 +0200
@@ -424,6 +424,7 @@
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -512,7 +513,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop
--- old/config/i386/desktop 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/desktop 2009-09-23 13:30:39.000000000 +0200
@@ -429,6 +429,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -517,7 +518,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/pae 2009-09-23 13:30:39.000000000 +0200
@@ -444,6 +444,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -532,7 +533,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace
--- old/config/i386/trace 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/trace 2009-09-23 13:30:39.000000000 +0200
@@ -444,6 +444,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -532,7 +533,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -510,7 +510,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
@@ -4916,3 +4916,4 @@
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_NLATTR=y
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2009-09-15 11:28:06.000000000 +0200
+++ new/config/i386/xen 2009-09-23 13:30:39.000000000 +0200
@@ -362,6 +362,7 @@
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -405,7 +406,7 @@
CONFIG_PCI_GUESTDEV=y
CONFIG_PCI_IOMULTI=y
CONFIG_PCI_RESERVE=y
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
CONFIG_SCx200=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ia64/debug 2009-09-23 13:30:39.000000000 +0200
@@ -300,6 +300,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -347,7 +348,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ia64/default 2009-09-23 13:30:39.000000000 +0200
@@ -300,6 +300,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
@@ -346,7 +347,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace
--- old/config/ia64/trace 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ia64/trace 2009-09-23 13:30:39.000000000 +0200
@@ -301,6 +301,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
@@ -347,7 +348,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla
--- old/config/ia64/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ia64/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -342,7 +342,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
@@ -3979,3 +3979,4 @@
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_IRQ_PER_CPU=y
CONFIG_IOMMU_API=y
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default
--- old/config/ppc/default 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc/default 2009-09-23 13:30:39.000000000 +0200
@@ -377,7 +377,7 @@
# CONFIG_PCI_MSI is not set
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_PCCARD=m
# CONFIG_PCMCIA_DEBUG is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/kdump new/config/ppc/kdump
--- old/config/ppc/kdump 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc/kdump 2009-09-23 13:30:39.000000000 +0200
@@ -377,7 +377,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64
--- old/config/ppc/ppc64 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc/ppc64 2009-09-23 13:30:39.000000000 +0200
@@ -436,7 +436,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
# CONFIG_PCCARD is not set
CONFIG_HOTPLUG_PCI=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla
--- old/config/ppc/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -375,7 +375,7 @@
# CONFIG_PCI_MSI is not set
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_PCCARD=m
# CONFIG_PCMCIA_DEBUG is not set
@@ -3818,3 +3818,4 @@
CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/kdump new/config/ppc64/kdump
--- old/config/ppc64/kdump 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc64/kdump 2009-09-23 13:30:39.000000000 +0200
@@ -377,7 +377,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64
--- old/config/ppc64/ppc64 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc64/ppc64 2009-09-23 13:30:39.000000000 +0200
@@ -436,7 +436,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
# CONFIG_PCCARD is not set
CONFIG_HOTPLUG_PCI=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla
--- old/config/ppc64/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/ppc64/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -3656,3 +3656,4 @@
CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla
--- old/config/s390x/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/s390x/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -1488,3 +1488,4 @@
# CONFIG_VIRTUALIZATION is not set
CONFIG_VIRTIO=y
CONFIG_VIRTIO_RING=y
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/debug 2009-09-23 13:30:39.000000000 +0200
@@ -425,6 +425,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -495,7 +496,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
CONFIG_PCI_DEBUG=y
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/default 2009-09-23 13:30:39.000000000 +0200
@@ -426,6 +426,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -496,7 +497,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop
--- old/config/x86_64/desktop 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/desktop 2009-09-23 13:30:39.000000000 +0200
@@ -411,6 +411,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -481,7 +482,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace
--- old/config/x86_64/trace 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/trace 2009-09-23 13:30:39.000000000 +0200
@@ -426,6 +426,7 @@
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -496,7 +497,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/vanilla 2009-09-23 13:30:39.000000000 +0200
@@ -491,7 +491,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
@@ -4672,3 +4672,4 @@
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_NLATTR=y
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2009-09-15 11:28:06.000000000 +0200
+++ new/config/x86_64/xen 2009-09-23 13:30:39.000000000 +0200
@@ -345,6 +345,7 @@
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
@@ -387,7 +388,7 @@
CONFIG_PCI_GUESTDEV=y
CONFIG_PCI_IOMULTI=y
CONFIG_PCI_RESERVE=y
-CONFIG_PCI_STUB=m
+CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
CONFIG_K8_NB=y
++++++ kernel-module-subpackage ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:49.000000000 +0200
@@ -1,5 +1,6 @@
%package -n %{-n*}-%1
-Version: %(echo %{-v*}-%2 | tr - _)
+%define _this_kmp_version %{-v*}_%(echo %2 | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/; # use 2.6.x.0 for mainline kernels')
+Version: %_this_kmp_version
Release: %{-r*}
%(
for spec in {%_sourcedir,%_specdir}/%name.spec /dev/null; do
@@ -19,7 +20,7 @@
print tags["group"] }
' $spec
)
-Provides: %{-n*} = %(echo %{-v*}-%2 | tr - _)
+Provides: %{-n*} = %_this_kmp_version
Requires: coreutils grep
Enhances: kernel-%1
AutoReqProv: on
@@ -47,19 +48,16 @@
' $spec
)
%post -n %{-n*}-%1
-version=%(echo %{-v*}-%2 | tr - _)
-nvr=%{-n*}-%1-$version-%{-r*}
+nvr=%{-n*}-%1-%_this_kmp_version-%{-r*}
wm2=/usr/lib/module-init-tools/weak-modules2
if [ -x $wm2 ]; then
/bin/bash -${-/e/} $wm2 --add-kmp $nvr
fi
%preun -n %{-n*}-%1
-version=%(echo %{-v*}-%2 | tr - _)
-nvr=%{-n*}-%1-$version-%{-r*}
+nvr=%{-n*}-%1-%_this_kmp_version-%{-r*}
rpm -ql $nvr | sed -n '/\.ko$/p' > /var/run/rpm-$nvr-modules
%postun -n %{-n*}-%1
-version=%(echo %{-v*}-%2 | tr - _)
-nvr=%{-n*}-%1-$version-%{-r*}
+nvr=%{-n*}-%1-%_this_kmp_version-%{-r*}
modules=( $(cat /var/run/rpm-$nvr-modules) )
rm -f /var/run/rpm-$nvr-modules
if [ ${#modules[*]} = 0 ]; then
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:51.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:51.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:51.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:51.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-ia64.patch new/patches.arch/acpi_srat-pxm-rev-ia64.patch
--- old/patches.arch/acpi_srat-pxm-rev-ia64.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpi_srat-pxm-rev-ia64.patch 2009-09-17 21:25:56.000000000 +0200
@@ -0,0 +1,58 @@
+From: Kurt Garloff
+Subject: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)
+References: bnc#503038
+
+In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides
+32bits for these. The new fields were reserved before.
+According to the ACPI spec, the OS must disregrard reserved fields.
+
+ia64 did handle the PXM fields almost consistently, but depending on
+sgi's sn2 platform. This patch leaves the sn2 logic in, but does also
+use 16/32 bits for PXM if the SRAT has rev 2 or higher.
+
+The patch also adds __init to the two pxm accessor functions, as they
+access __initdata now and are called from an __init function only anyway.
+
+Note that the code only uses 16 bits for the PXM field in the processor
+proximity field; the patch does not address this as 16 bits are more than
+enough.
+
+This is patch 3/3.
+
+Signed-off-by: Kurt Garloff
+
+---
+ arch/ia64/kernel/acpi.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/arch/ia64/kernel/acpi.c
++++ b/arch/ia64/kernel/acpi.c
+@@ -430,22 +430,24 @@ static u32 __devinitdata pxm_flag[PXM_FL
+ static struct acpi_table_slit __initdata *slit_table;
+ cpumask_t early_cpu_possible_map = CPU_MASK_NONE;
+
+-static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
++static int __init
++get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
+ {
+ int pxm;
+
+ pxm = pa->proximity_domain_lo;
+- if (ia64_platform_is("sn2"))
++ if (ia64_platform_is("sn2") || acpi_srat_revision >= 2)
+ pxm += pa->proximity_domain_hi[0] << 8;
+ return pxm;
+ }
+
+-static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
++static int __init
++get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
+ {
+ int pxm;
+
+ pxm = ma->proximity_domain;
+- if (!ia64_platform_is("sn2"))
++ if (!ia64_platform_is("sn2") && acpi_srat_revision <= 1)
+ pxm &= 0xff;
+
+ return pxm;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-store.patch new/patches.arch/acpi_srat-pxm-rev-store.patch
--- old/patches.arch/acpi_srat-pxm-rev-store.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpi_srat-pxm-rev-store.patch 2009-09-17 21:25:56.000000000 +0200
@@ -0,0 +1,51 @@
+From: Kurt Garloff
+Subject: Store SRAT table revision
+References: bnc#503038
+
+In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides
+32bits for these. The new fields were reserved before.
+According to the ACPI spec, the OS must disregrard reserved fields.
+In order to know whether or not, we must know what version the SRAT
+table has.
+
+This patch stores the SRAT table revision for later consumption
+by arch specific __init functions.
+
+This is patch 1/3.
+
+Signed-off-by: Kurt Garloff
+
+---
+ drivers/acpi/numa.c | 3 +++
+ include/acpi/acpi_numa.h | 1 +
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/acpi/numa.c
++++ b/drivers/acpi/numa.c
+@@ -43,6 +43,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAI
+ static int node_to_pxm_map[MAX_NUMNODES]
+ = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
+
++unsigned char acpi_srat_revision __initdata;
++
+ int pxm_to_node(int pxm)
+ {
+ if (pxm < 0)
+@@ -225,6 +227,7 @@ static int __init acpi_parse_srat(struct
+ return -EINVAL;
+
+ srat = (struct acpi_table_srat *)table;
++ acpi_srat_revision = srat->header.revision;
+
+ return 0;
+ }
+--- a/include/acpi/acpi_numa.h
++++ b/include/acpi/acpi_numa.h
+@@ -15,6 +15,7 @@ extern int pxm_to_node(int);
+ extern int node_to_pxm(int);
+ extern void __acpi_map_pxm_to_node(int, int);
+ extern int acpi_map_pxm_to_node(int);
++extern unsigned char acpi_srat_revision;
+
+ #endif /* CONFIG_ACPI_NUMA */
+ #endif /* __ACP_NUMA_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-x86-64.patch new/patches.arch/acpi_srat-pxm-rev-x86-64.patch
--- old/patches.arch/acpi_srat-pxm-rev-x86-64.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpi_srat-pxm-rev-x86-64.patch 2009-09-17 21:25:56.000000000 +0200
@@ -0,0 +1,41 @@
+From: Kurt Garloff
+Subject: Use SRAT table rev to use 8bit or 32bit PXM fields (x86-64)
+References: bnc#503038
+
+In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides
+32bits for these. The new fields were reserved before.
+According to the ACPI spec, the OS must disregrard reserved fields.
+
+x86-64 was rather inconsistent prior to this patch; it used 8 bits
+for the pxm field in cpu_affinity, but 32 bits in mem_affinity.
+This patch makes it consistent: Either use 8 bits consistently (SRAT
+rev 1 or lower) or 32 bits (SRAT rev 2 or higher).
+
+This is patch 2/3.
+
+Signed-off-by: Kurt Garloff
+
+---
+ arch/x86/mm/srat_64.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/x86/mm/srat_64.c
++++ b/arch/x86/mm/srat_64.c
+@@ -133,6 +133,8 @@ acpi_numa_processor_affinity_init(struct
+ if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
+ return;
+ pxm = pa->proximity_domain_lo;
++ if (acpi_srat_revision >= 2)
++ pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
+ node = setup_node(pxm);
+ if (node < 0) {
+ printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
+@@ -243,6 +245,8 @@ acpi_numa_memory_affinity_init(struct ac
+ start = ma->base_address;
+ end = start + ma->length;
+ pxm = ma->proximity_domain;
++ if (acpi_srat_revision <= 1)
++ pxm &= 0xff;
+ node = setup_node(pxm);
+ if (node < 0) {
+ printk(KERN_ERR "SRAT: Too many proximity domains.\n");
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-2.6.32-rc1 new/patches.drivers/alsa-hda-2.6.32-rc1
--- old/patches.drivers/alsa-hda-2.6.32-rc1 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/alsa-hda-2.6.32-rc1 2009-09-17 21:08:21.000000000 +0200
@@ -0,0 +1,232 @@
+From: Takashi Iwai
+Subject: ALSA HD-audio backport from 2.6.32-rc1
+Patch-mainline: 2.6.32-rc1
+References:
+
+Additional HD-audio fixes from 2.6.32-rc1.
+
+Signed-off-by: Takashi Iwai
+
+---
+ sound/pci/hda/patch_realtek.c | 21 ++++++++++---
+ sound/pci/hda/patch_sigmatel.c | 65 +++++++++++++++++++++--------------------
+ 2 files changed, 51 insertions(+), 35 deletions(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -7927,8 +7927,9 @@
+
+ static struct snd_kcontrol_new alc883_targa_mixer[] = {
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
++ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+ HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+- HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+ HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+ HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+ HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+@@ -7947,8 +7948,9 @@
+
+ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
++ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+ HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+- HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+ HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+ HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+@@ -7960,6 +7962,15 @@
+ { } /* end */
+ };
+
++static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = {
++ HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
++ HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
++ HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
++ HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
++ HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
++ { } /* end */
++};
++
+ static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+@@ -9167,7 +9178,8 @@
+ .init_hook = alc882_targa_automute,
+ },
+ [ALC883_TARGA_8ch_DIG] = {
+- .mixers = { alc883_base_mixer, alc883_chmode_mixer },
++ .mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer,
++ alc883_chmode_mixer },
+ .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
+ alc883_targa_verbs },
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+@@ -13370,7 +13382,8 @@
+ [ALC269_ASUS_EEEPC_P703] = "eeepc-p703",
+ [ALC269_ASUS_EEEPC_P901] = "eeepc-p901",
+ [ALC269_FUJITSU] = "fujitsu",
+- [ALC269_LIFEBOOK] = "lifebook"
++ [ALC269_LIFEBOOK] = "lifebook",
++ [ALC269_AUTO] = "auto",
+ };
+
+ static struct snd_pci_quirk alc269_cfg_tbl[] = {
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -864,10 +864,6 @@
+ };
+
+ static struct hda_verb stac92hd83xxx_core_init[] = {
+- { 0xa, AC_VERB_SET_CONNECT_SEL, 0x1},
+- { 0xb, AC_VERB_SET_CONNECT_SEL, 0x1},
+- { 0xd, AC_VERB_SET_CONNECT_SEL, 0x0},
+-
+ /* power state controls amps */
+ { 0x01, AC_VERB_SET_EAPD, 1 << 2},
+ {}
+@@ -1590,8 +1586,8 @@
+ };
+
+ static unsigned int dell_s14_pin_configs[10] = {
+- 0x02214030, 0x02211010, 0x02a19020, 0x01014050,
+- 0x40f000f0, 0x01819040, 0x40f000f0, 0x90a60160,
++ 0x0221403f, 0x0221101f, 0x02a19020, 0x90170110,
++ 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a60160,
+ 0x40f000f0, 0x40f000f0,
+ };
+
+@@ -1690,6 +1686,8 @@
+ "HP mini 1000", STAC_HP_M4),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b,
+ "HP HDX", STAC_HP_HDX), /* HDX16 */
++ SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,
++ "HP dv6", STAC_HP_DV5),
+ SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,
+ "HP", STAC_HP_DV5),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
+@@ -4166,7 +4164,10 @@
+ stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0],
+ AC_PINCTL_OUT_EN);
+ /* fake event to set up pins */
+- stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]);
++ if (cfg->hp_pins[0])
++ stac_issue_unsol_event(codec, cfg->hp_pins[0]);
++ else if (cfg->line_out_pins[0])
++ stac_issue_unsol_event(codec, cfg->line_out_pins[0]);
+ } else {
+ stac92xx_auto_init_multi_out(codec);
+ stac92xx_auto_init_hp_out(codec);
+@@ -4688,8 +4689,13 @@
+ snd_hda_codec_resume_amp(codec);
+ snd_hda_codec_resume_cache(codec);
+ /* fake event to set up pins again to override cached values */
+- if (spec->hp_detect)
+- stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]);
++ if (spec->hp_detect) {
++ if (spec->autocfg.hp_pins[0])
++ stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0]);
++ else if (spec->autocfg.line_out_pins[0])
++ stac_issue_unsol_event(codec,
++ spec->autocfg.line_out_pins[0]);
++ }
+ return 0;
+ }
+
+@@ -5016,7 +5022,7 @@
+ spec->eapd_switch = 1;
+ break;
+ }
+- if (spec->board_config > STAC_92HD73XX_REF) {
++ if (spec->board_config != STAC_92HD73XX_REF) {
+ /* GPIO0 High = Enable EAPD */
+ spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
+ spec->gpio_data = 0x01;
+@@ -5066,7 +5072,6 @@
+
+ codec->spec = spec;
+ codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
+- spec->mono_nid = 0x19;
+ spec->digbeep_nid = 0x21;
+ spec->mux_nids = stac92hd83xxx_mux_nids;
+ spec->num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids);
+@@ -5242,7 +5247,7 @@
+ stac92xx_set_config_regs(codec,
+ stac92hd71bxx_brd_tbl[spec->board_config]);
+
+- if (spec->board_config > STAC_92HD71BXX_REF) {
++ if (spec->board_config != STAC_92HD71BXX_REF) {
+ /* GPIO0 = EAPD */
+ spec->gpio_mask = 0x01;
+ spec->gpio_dir = 0x01;
+@@ -5375,6 +5380,11 @@
+ case STAC_HP_DV5:
+ snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);
+ stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN);
++ /* HP dv6 gives the headphone pin as a line-out. Thus we
++ * need to set hp_detect flag here to force to enable HP
++ * detection.
++ */
++ spec->hp_detect = 1;
+ break;
+ case STAC_HP_HDX:
+ spec->num_dmics = 1;
+@@ -5557,14 +5567,17 @@
+ spec->dac_list = stac927x_dac_nids;
+ spec->multiout.dac_nids = spec->dac_nids;
+
++ if (spec->board_config != STAC_D965_REF) {
++ /* GPIO0 High = Enable EAPD */
++ spec->eapd_mask = spec->gpio_mask = 0x01;
++ spec->gpio_dir = spec->gpio_data = 0x01;
++ }
++
+ switch (spec->board_config) {
+ case STAC_D965_3ST:
+ case STAC_D965_5ST:
+ /* GPIO0 High = Enable EAPD */
+- spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x01;
+- spec->gpio_data = 0x01;
+ spec->num_dmics = 0;
+-
+ spec->init = d965_core_init;
+ break;
+ case STAC_DELL_BIOS:
+@@ -5583,16 +5596,11 @@
+ snd_hda_codec_set_pincfg(codec, 0x0e, 0x02a79130);
+ /* fallthru */
+ case STAC_DELL_3ST:
+- /* GPIO2 High = Enable EAPD */
+- spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x04;
+- spec->gpio_data = 0x04;
+- switch (codec->subsystem_id) {
+- case 0x1028022f:
+- /* correct EAPD to be GPIO0 */
+- spec->eapd_mask = spec->gpio_mask = 0x01;
+- spec->gpio_dir = spec->gpio_data = 0x01;
+- break;
+- };
++ if (codec->subsystem_id != 0x1028022f) {
++ /* GPIO2 High = Enable EAPD */
++ spec->eapd_mask = spec->gpio_mask = 0x04;
++ spec->gpio_dir = spec->gpio_data = 0x04;
++ }
+ spec->dmic_nids = stac927x_dmic_nids;
+ spec->num_dmics = STAC927X_NUM_DMICS;
+
+@@ -5601,14 +5609,9 @@
+ spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids);
+ break;
+ default:
+- if (spec->board_config > STAC_D965_REF) {
+- /* GPIO0 High = Enable EAPD */
+- spec->eapd_mask = spec->gpio_mask = 0x01;
+- spec->gpio_dir = spec->gpio_data = 0x01;
+- }
+ spec->num_dmics = 0;
+-
+ spec->init = stac927x_core_init;
++ break;
+ }
+
+ spec->num_caps = STAC927X_NUM_CAPS;
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch new/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
--- old/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch 2009-09-14 21:34:43.000000000 +0200
+++ new/patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch 2009-09-21 20:20:25.000000000 +0200
@@ -18,18 +18,26 @@
It also contains a fix for compilation on non-ACPI platforms provided by Rene Rebe.
+Update 17 Sep 2009 jeffm@suse.com:
+- 2.6.30 (or so) introduced very early ACPI initialization for proper SMP
+ detection. This caused crashes since things like the mm caches weren't
+ set up yet, so kmalloc would crash. This update delays overriding the DSDT
+ until the acpi_early_init() call that used to override it. Since there is
+ a DSDT already loaded, it is necessarily a bit hacky.
+
Signed-off-by: Eric Piel
Signed-off-by: Thomas Renninger
Signed-off-by: Len Brown
+Signed-off-by: Jeff Mahoney
---
Documentation/acpi/dsdt-override.txt | 12 +++-
Documentation/acpi/initramfs-add-dsdt.sh | 43 +++++++++++++++
Documentation/kernel-parameters.txt | 3 +
drivers/acpi/Kconfig | 11 ++++
- drivers/acpi/acpica/tbxface.c | 7 --
- drivers/acpi/osl.c | 26 +++++++++
+ drivers/acpi/acpica/tbxface.c | 36 +++++++++++--
+ drivers/acpi/osl.c | 28 +++++++++-
init/initramfs.c | 84 +++++++++++++++++++++++++++++++
- 7 files changed, 178 insertions(+), 8 deletions(-)
+ 7 files changed, 209 insertions(+), 8 deletions(-)
create mode 100644 Documentation/acpi/initramfs-add-dsdt.sh
--- a/Documentation/acpi/dsdt-override.txt
@@ -100,7 +108,7 @@
+
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -210,6 +210,9 @@ and is between 256 and 4096 characters.
+@@ -216,6 +216,9 @@ and is between 256 and 4096 characters.
acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT
@@ -132,7 +140,41 @@
default 0
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
-@@ -496,7 +496,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_ind
+@@ -484,6 +484,33 @@ acpi_get_table_by_index(u32 table_index,
+
+ ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
+
++static void
++acpi_dsdt_initrd_override(void)
++{
++#if defined(CONFIG_ACPI_CUSTOM_DSDT_INITRD)
++ struct acpi_table_header *new = NULL;
++ struct acpi_table_desc *table;
++ acpi_status status;
++
++ table = &acpi_gbl_root_table_list.tables[ACPI_TABLE_INDEX_DSDT];
++ status = acpi_os_table_override(table->pointer, &new);
++ if (ACPI_SUCCESS(status) && new) {
++ acpi_tb_delete_table(table);
++
++ /* This is the top part of acpi_table_load */
++ memset(table, 0, sizeof(*table));
++ table->address = ACPI_PTR_TO_PHYSADDR(new);
++ table->pointer = new;
++ table->length = new->length;
++ table->flags |= ACPI_TABLE_ORIGIN_OVERRIDE;
++ table->flags |= ACPI_TABLE_ORIGIN_ALLOCATED;
++ memcpy(table->signature.ascii, new->signature, ACPI_NAME_SIZE);
++ acpi_tb_print_table_header(table->address, new);
++ }
++#endif
++}
++
++
+ /*******************************************************************************
+ *
+ * FUNCTION: acpi_tb_load_namespace
+@@ -496,7 +523,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_ind
* the RSDT/XSDT.
*
******************************************************************************/
@@ -141,7 +183,16 @@
{
acpi_status status;
u32 i;
-@@ -590,7 +590,7 @@ static acpi_status acpi_tb_load_namespac
+@@ -522,6 +549,8 @@ static acpi_status acpi_tb_load_namespac
+ goto unlock_and_exit;
+ }
+
++ acpi_dsdt_initrd_override();
++
+ /* A valid DSDT is required */
+
+ status =
+@@ -590,7 +619,7 @@ static acpi_status acpi_tb_load_namespac
*
******************************************************************************/
@@ -150,7 +201,7 @@
{
acpi_status status;
-@@ -607,9 +607,6 @@ acpi_status acpi_load_tables(void)
+@@ -607,9 +636,6 @@ acpi_status acpi_load_tables(void)
return_ACPI_STATUS(status);
}
@@ -162,7 +213,7 @@
* FUNCTION: acpi_install_table_handler
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
-@@ -95,6 +95,11 @@ static DEFINE_SPINLOCK(acpi_res_lock);
+@@ -96,6 +96,11 @@ static DEFINE_SPINLOCK(acpi_res_lock);
#define OSI_STRING_LENGTH_MAX 64 /* arbitrary */
static char osi_additional_string[OSI_STRING_LENGTH_MAX];
@@ -174,7 +225,7 @@
/*
* The story of _OSI(Linux)
*
-@@ -321,7 +326,7 @@ acpi_os_predefined_override(const struct
+@@ -350,7 +355,7 @@ acpi_os_predefined_override(const struct
return AE_OK;
}
@@ -183,13 +234,15 @@
acpi_os_table_override(struct acpi_table_header * existing_table,
struct acpi_table_header ** new_table)
{
-@@ -334,6 +339,16 @@ acpi_os_table_override(struct acpi_table
+@@ -363,6 +368,18 @@ acpi_os_table_override(struct acpi_table
if (strncmp(existing_table->signature, "DSDT", 4) == 0)
*new_table = (struct acpi_table_header *)AmlCode;
#endif
+#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
+ if ((strncmp(existing_table->signature, "DSDT", 4) == 0) &&
-+ !acpi_no_initrd_override) {
++ !acpi_no_initrd_override && acpi_gbl_permanent_mmap) {
++ /* JDM: acpi_gbl_permanent_mmap means acpi_early_init() has
++ * been called so things like kmalloc are ok. */
+ struct acpi_table_header *initrd_table;
+
+ initrd_table = acpi_find_dsdt_initrd();
@@ -200,7 +253,7 @@
if (*new_table != NULL) {
printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], "
"this is unsafe: tainting kernel\n",
-@@ -344,6 +359,15 @@ acpi_os_table_override(struct acpi_table
+@@ -373,6 +390,15 @@ acpi_os_table_override(struct acpi_table
return AE_OK;
}
@@ -274,7 +327,7 @@
clean_path(collected, mode);
if (S_ISREG(mode)) {
int ml = maybe_link();
-@@ -332,6 +353,40 @@ static int __init do_name(void)
+@@ -333,6 +354,40 @@ static int __init do_name(void)
return 0;
}
@@ -315,7 +368,7 @@
static int __init do_copy(void)
{
if (count >= body_len) {
-@@ -369,6 +424,7 @@ static __initdata int (*actions[])(void)
+@@ -370,6 +425,7 @@ static __initdata int (*actions[])(void)
[SkipIt] = do_skip,
[GotName] = do_name,
[CopyFile] = do_copy,
@@ -323,7 +376,7 @@
[GotSymlink] = do_symlink,
[Reset] = do_reset,
};
-@@ -608,3 +664,31 @@ static int __init populate_rootfs(void)
+@@ -606,3 +662,31 @@ static int __init populate_rootfs(void)
return 0;
}
rootfs_initcall(populate_rootfs);
@@ -346,7 +399,7 @@
+ * we give up if the initramfs cannot be entirely read.
+ */
+ kfree(file_mem);
-+ printk(KERN_ERR "ACPI: Aborded because %s.\n", err);
++ printk(KERN_ERR "ACPI: Aborted because %s.\n", err);
+ return NULL;
+ }
+ if (file_mem)
++++++ patches.xen.tar.bz2 ++++++
++++ 43378 lines of diff (skipped)
++++++ postun.sh ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:55.000000000 +0200
@@ -1,7 +1,16 @@
wm2=/usr/lib/module-init-tools/weak-modules2
+nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@
+
+if [ -e /boot/System.map-@KERNELRELEASE@-@FLAVOR@ ]; then
+ # the same package was reinstalled or just rebuilt, otherwise the files
+ # would have been deleted by now
+ # do not remove anything in this case (bnc#533766)
+ rm -f /var/run/rpm-$nvr-modules
+ exit 0
+fi
+
if [ @BASE_PACKAGE@ = 0 ]; then
if [ -x $wm2 ]; then
- nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@
/bin/bash -${-/e/} $wm2 --remove-kernel-modules @KERNELRELEASE@-@FLAVOR@ < /var/run/rpm-$nvr-modules
fi
rm -f /var/run/rpm-$nvr-modules
@@ -12,13 +21,6 @@
/bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@
fi
-suffix=
-case @FLAVOR@ in
- kdump|ps3|xen*|vanilla)
- suffix=-@FLAVOR@
- ;;
-esac
-
# remove fstab check once perl-Bootloader can cope with it
if [ -f /etc/fstab ]; then
if [ -x /usr/lib/bootloader/bootloader_entry ]; then
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:56.000000000 +0200
@@ -233,7 +233,7 @@
# Check resource conflicts between hwmon and ACPI OpRegs
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
-+needs_update patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
+ patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
patches.arch/acpi_thermal_passive_blacklist.patch
patches.arch/acpi-export-hotplug_execute
@@ -245,6 +245,10 @@
# for example SLE11 specific BIOS updates (if there is no other
# way to safely solve an ACPI issue).
+trenn patches.suse/acpi_osi_sle11_ident.patch
+ patches.arch/acpi_srat-pxm-rev-store.patch
+ patches.arch/acpi_srat-pxm-rev-ia64.patch
+ patches.arch/acpi_srat-pxm-rev-x86-64.patch
+
########################################################
# CPUFREQ
@@ -455,6 +459,7 @@
# more udpates
patches.drivers/alsa-hda-2.6.32-pre
+ patches.drivers/alsa-hda-2.6.32-rc1
patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2
patches.drivers/alsa-ctxfi-03-Simple-code-clean-up
@@ -685,10 +690,7 @@
patches.xen/xen3-patch-2.6.28
patches.xen/xen3-patch-2.6.29
patches.xen/xen3-patch-2.6.30
- patches.xen/xen3-patch-2.6.31-rc4
- patches.xen/xen3-patch-2.6.31-rc4-rc5
- patches.xen/xen3-patch-2.6.31-rc5-rc6
- patches.xen/xen3-patch-2.6.31-rc7-rc8
+ patches.xen/xen3-patch-2.6.31
patches.xen/xen3-seccomp-disable-tsc-option
+needs_to_go_away patches.xen/xen3-x86-mark_rodata_rw.patch
patches.xen/xen3-use-totalram_pages
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.Mk6Xoy/_old 2009-09-28 17:14:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Mk6Xoy/_new 2009-09-28 17:14:56.000000000 +0200
@@ -1,3 +1,3 @@
-2009-09-15 11:30:09 +0200
-GIT Revision: bc902ececdf4c1739202ba3990a2f1e65060b648
+2009-09-23 13:30:39 +0200
+GIT Revision: 050bdf92965594e5fd91c21496c79511a7d6762c
GIT Branch: master
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org