summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec5
-rw-r--r--pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch66
-rw-r--r--prevent-runtime-conntrack-changes.patch74
3 files changed, 0 insertions, 145 deletions
diff --git a/kernel.spec b/kernel.spec
index a3b0fd1c8..3fc124fa3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -632,7 +632,6 @@ Patch204: linux-2.6-debug-always-inline-kzalloc.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
-Patch386: pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch
Patch385: ima-allow-it-to-be-completely-disabled-and-default-off.patch
@@ -708,8 +707,6 @@ Patch12010: add-appleir-usb-driver.patch
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch12017: prevent-runtime-conntrack-changes.patch
-
Patch12018: neuter_intel_microcode_load.patch
Patch12101: apple_backlight.patch
@@ -1230,8 +1227,6 @@ ApplyPatch linux-2.6-defaults-pci_no_msi.patch
ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
-# rhbz#638912
-#ApplyPatch pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch
#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
diff --git a/pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch b/pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch
deleted file mode 100644
index 0baffd639..000000000
--- a/pci-_osc-supported-field-should-contain-supported-features-not-enabled-ones.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-commit 885c252ffb059dc493200bdb981bdd21cabe4442
-Author: Matthew Garrett <mjg@redhat.com>
-Date: Thu Dec 9 18:31:59 2010 -0500
-
- PCI: _OSC "supported" field should contain supported features, not enabled ones
-
- From testing with Windows, the call to the PCI root _OSC method includes
- the full set of features supported by the operating system even if the
- hardware has already indicated that it doesn't support ASPM or MSI.
- https://bugzilla.redhat.com/show_bug.cgi?id=638912 is a case where making
- the _OSC call will incorrectly configure the chipset unless the supported
- field has bits 1, 2 and 4 set. Rework the functionality to ensure that
- we match this behaviour.
-
- Signed-off-by: Matthew Garrett <mjg@redhat.com>
-
-diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
-index 96668ad..afb5d08 100644
---- a/drivers/acpi/pci_root.c
-+++ b/drivers/acpi/pci_root.c
-@@ -450,7 +450,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
- struct acpi_pci_root *root;
- acpi_handle handle;
- struct acpi_device *child;
-- u32 flags, base_flags;
-+ u32 flags;
-
- root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
- if (!root)
-@@ -498,10 +498,15 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
- device->driver_data = root;
-
- /*
-- * All supported architectures that use ACPI have support for
-- * PCI domains, so we indicate this in _OSC support capabilities.
-+ * Indicate support for various _OSC capabilities. These match
-+ * what the operating system supports, not what the hardware supports,
-+ * so they shouldn't be conditional on functionality that's been
-+ * blacklisted
- */
-- flags = base_flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
-+ flags = OSC_EXT_PCI_CONFIG_SUPPORT | OSC_ACTIVE_STATE_PWR_SUPPORT |
-+ OSC_CLOCK_PWR_CAPABILITY_SUPPORT |
-+ OSC_PCI_SEGMENT_GROUPS_SUPPORT | OSC_MSI_SUPPORT;
-+
- acpi_pci_osc_support(root, flags);
-
- /*
-@@ -555,17 +560,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
- list_for_each_entry(child, &device->children, node)
- acpi_pci_bridge_scan(child);
-
-- /* Indicate support for various _OSC capabilities. */
-- if (pci_ext_cfg_avail(root->bus->self))
-- flags |= OSC_EXT_PCI_CONFIG_SUPPORT;
-- if (pcie_aspm_enabled())
-- flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |
-- OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
-- if (pci_msi_enabled())
-- flags |= OSC_MSI_SUPPORT;
-- if (flags != base_flags)
-- acpi_pci_osc_support(root, flags);
--
- pci_acpi_add_bus_pm_notifier(device, root->bus);
- if (device->wakeup.flags.run_wake)
- device_set_run_wake(root->bus->bridge, true);
diff --git a/prevent-runtime-conntrack-changes.patch b/prevent-runtime-conntrack-changes.patch
deleted file mode 100644
index 59d62f3de..000000000
--- a/prevent-runtime-conntrack-changes.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Jon Masters correctly points out that conntrack hash sizes
-(nf_conntrack_htable_size) are global (not per-netns) and
-modifiable at runtime via /sys/module/nf_conntrack/hashsize .
-
-Steps to reproduce:
- clone(CLONE_NEWNET)
- [grow /sys/module/nf_conntrack/hashsize]
- exit()
-
-At netns exit we are going to scan random memory for conntracks to be killed.
-
-Apparently there is a code which deals with hashtable resize for
-init_net (and it was there befode netns conntrack code), so prohibit
-hashsize modification if there is more than one netns exists.
-
-To change hashtable sizes, you need to reload module.
-
-Expectation hashtable size was simply glued to a variable with no code
-to rehash expectations, so it was a bug to allow writing to it.
-Make "expect_hashsize" readonly.
-
-This is temporarily until we figure out what to do.
-
-Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
-Cc: stable@kernel.org
----
-
- net/netfilter/nf_conntrack_core.c | 15 +++++++++++++++
- net/netfilter/nf_conntrack_expect.c | 2 +-
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -21,6 +21,7 @@
- #include <linux/stddef.h>
- #include <linux/slab.h>
- #include <linux/random.h>
-+#include <linux/rtnetlink.h>
- #include <linux/jhash.h>
- #include <linux/err.h>
- #include <linux/percpu.h>
-@@ -1198,6 +1199,20 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
- if (!nf_conntrack_htable_size)
- return param_set_uint(val, kp);
-
-+ {
-+ struct net *net;
-+ unsigned int nr;
-+
-+ nr = 0;
-+ rtnl_lock();
-+ for_each_net(net)
-+ nr++;
-+ rtnl_unlock();
-+ /* init_net always exists */
-+ if (nr != 1)
-+ return -EINVAL;
-+ }
-+
- hashsize = simple_strtoul(val, NULL, 0);
- if (!hashsize)
- return -EINVAL;
---- a/net/netfilter/nf_conntrack_expect.c
-+++ b/net/netfilter/nf_conntrack_expect.c
-@@ -569,7 +569,7 @@ static void exp_proc_remove(struct net *net)
- #endif /* CONFIG_PROC_FS */
- }
-
--module_param_named(expect_hashsize, nf_ct_expect_hsize, uint, 0600);
-+module_param_named(expect_hashsize, nf_ct_expect_hsize, uint, 0400);
-
- int nf_conntrack_expect_init(struct net *net)
- {
-