rpms/kernel/F-10 Makefile, 1.91, 1.92 config-generic, 1.211, 1.212 kernel.spec, 1.1242, 1.1243 linux-2.6-defaults-pci_no_msi.patch, 1.3, 1.4
Kyle McMartin
kyle at fedoraproject.org
Wed Feb 4 19:24:33 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17082
Modified Files:
Makefile config-generic kernel.spec
linux-2.6-defaults-pci_no_msi.patch
Log Message:
* Wed Feb 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.13.rc3.git6
- Update pci msi defaults patch from rawhide.
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Makefile,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Makefile 12 Jan 2009 19:51:27 -0000 1.91
+++ Makefile 4 Feb 2009 19:24:03 -0000 1.92
@@ -63,7 +63,10 @@
@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
@perl -pi -e 's/# CONFIG_MODULE_FORCE_UNLOAD is not set/CONFIG_MODULE_FORCE_UNLOAD=y/' config-nodebug
@perl -pi -e 's/# CONFIG_SYSCTL_SYSCALL_CHECK is not set/CONFIG_SYSCTL_SYSCALL_CHECK=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DEBUG_NOTIFIERS is not set/CONFIG_DEBUG_NOTIFIERS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
+ @perl -pi -e 's/# CONFIG_BOOT_TRACER is not set/CONFIG_BOOT_TRACER=y/' config-generic
+ @perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
@# just in case we're going from extremedebug -> debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -101,7 +104,10 @@
@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
@perl -pi -e 's/CONFIG_MODULE_FORCE_UNLOAD=y/# CONFIG_MODULE_FORCE_UNLOAD is not set/' config-nodebug
@perl -pi -e 's/CONFIG_SYSCTL_SYSCALL_CHECK=y/# CONFIG_SYSCTL_SYSCALL_CHECK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_NOTIFIERS=y/# CONFIG_DEBUG_NOTIFIERS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/#\ CONFIG_PM_TEST_SUSPEND\ is\ not\ set/' config-generic
+ @perl -pi -e 's/CONFIG_BOOT_TRACER=y/#\ CONFIG_BOOT_TRACER\ is\ not\ set/' config-generic
+ @perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
@@ -113,7 +119,7 @@
reconfig:
@rm -f kernel-*-config
- @VERSION="2.6.27" make -f Makefile.config configs
+ @VERSION="2.6.28" make -f Makefile.config configs
@scripts/reconfig.sh
force-tag: $(SPECFILE) $(COMMON_DIR)/branches
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- config-generic 30 Jan 2009 02:54:07 -0000 1.211
+++ config-generic 4 Feb 2009 19:24:03 -0000 1.212
@@ -79,6 +79,7 @@
CONFIG_PCI_STUB=y
CONFIG_HT_IRQ=y
CONFIG_PCI_MSI=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1242
retrieving revision 1.1243
diff -u -r1.1242 -r1.1243
--- kernel.spec 4 Feb 2009 14:20:24 -0000 1.1242
+++ kernel.spec 4 Feb 2009 19:24:03 -0000 1.1243
@@ -1757,6 +1757,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Feb 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.13.rc3.git6
+- Update pci msi defaults patch from rawhide.
+
* Wed Feb 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.12.rc3.git6
- 2.6.29-rc3-git6
linux-2.6-defaults-pci_no_msi.patch:
Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-defaults-pci_no_msi.patch 29 Jan 2009 21:14:11 -0000 1.3
+++ linux-2.6-defaults-pci_no_msi.patch 4 Feb 2009 19:24:03 -0000 1.4
@@ -1,8 +1,8 @@
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index e0f346d..9e70467 100644
+index d8362cf..30d6053 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -1623,6 +1623,9 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -1674,6 +1674,9 @@ and is between 256 and 4096 characters. It is defined in the file
root domains (aka PCI segments, in ACPI-speak).
nommconf [X86-32,X86_64] Disable use of MMCONFIG for PCI
Configuration
@@ -12,20 +12,46 @@
nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide.
+diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
+index 2a4501d..209758c 100644
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -21,6 +21,18 @@ config PCI_MSI
+
+ If you don't know what to do here, say N.
+
++config PCI_MSI_DEFAULT_ON
++ def_bool y
++ prompt "Use Message Signaled Interrupts by default"
++ depends on PCI_MSI
++ help
++ Selecting this option will enable use of PCI MSI where applicable
++ by default. Support for MSI can be disabled through the use of the
++ pci=nomsi boot flag. Conversely, if this option is not selected,
++ support for PCI MSI can be enabled by passing the pci=msi flag.
++
++ If you don't know what to do here, say N.
++
+ config PCI_LEGACY
+ bool "Enable deprecated pci_find_* API"
+ depends on PCI
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index 74801f7..ffcf464 100644
+index 896a15d..53df583 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,11 @@
#include "pci.h"
#include "msi.h"
--static int pci_msi_enable = 1;
++#ifdef CONFIG_PCI_MSI_DEFAULT_ON
+ static int pci_msi_enable = 1;
++#else
+static int pci_msi_enable = 0;
++#endif /*CONFIG_PCI_MSI_DEFAULT_ON*/
/* Arch hooks */
-@@ -788,6 +788,11 @@ int pci_msi_enabled(void)
+@@ -786,6 +790,11 @@ int pci_msi_enabled(void)
}
EXPORT_SYMBOL(pci_msi_enabled);
@@ -38,10 +64,10 @@
{
INIT_LIST_HEAD(&dev->msi_list);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 061d1ee..883e572 100644
+index 17bd932..e9bc9fe 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
-@@ -2051,6 +2051,8 @@ static int __init pci_setup(char *str)
+@@ -2393,6 +2393,8 @@ static int __init pci_setup(char *str)
if (*str && (str = pcibios_setup(str)) && *str) {
if (!strcmp(str, "nomsi")) {
pci_no_msi();
@@ -50,9 +76,11 @@
} else if (!strcmp(str, "noaer")) {
pci_no_aer();
} else if (!strcmp(str, "nodomains")) {
---- linux-2.6.28.noarch/drivers/pci/pci.h~ 2009-01-08 09:45:35.000000000 -0500
-+++ linux-2.6.28.noarch/drivers/pci/pci.h 2009-01-08 09:45:49.000000000 -0500
-@@ -105,9 +105,11 @@ extern unsigned int pci_pm_d3_delay;
+diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
+index 26ddf78..85efe81 100644
+--- a/drivers/pci/pci.h
++++ b/drivers/pci/pci.h
+@@ -111,9 +111,11 @@ extern unsigned int pci_pm_d3_delay;
#ifdef CONFIG_PCI_MSI
void pci_no_msi(void);
More information about the scm-commits
mailing list