The s390 patch did not belong in 3.4 or 3.6.
the i915 quirk patch didn't belong in 3.6
+++ /dev/null
-From 4bffbb3455372a26816e364fb4448810f7014452 Mon Sep 17 00:00:00 2001
-From: Heiko Carstens <heiko.carstens@de.ibm.com>
-Date: Thu, 8 Nov 2012 14:18:47 +0100
-Subject: s390/mm: have 16 byte aligned struct pages
-
-From: Heiko Carstens <heiko.carstens@de.ibm.com>
-
-commit 4bffbb3455372a26816e364fb4448810f7014452 upstream.
-
-Select HAVE_ALIGNED_STRUCT_PAGE on s390, so that the slub allocator can make
-use of compare and swap double for lockless updates. This increases the size
-of struct page to 64 bytes (instead of 56 bytes), however the performance gain
-justifies the increased size:
-
-- now excactly four struct pages fit into a single cache line; the
- case that accessing a struct page causes two cache line loads
- does not exist anymore.
-- calculating the offset of a struct page within the memmap array
- is only a simple shift instead of a more expensive multiplication.
-
-A "hackbench 200 process 200" run on a 32 cpu system did show an 8% runtime
-improvement.
-
-Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-Signed-off-by: CAI Qian <caiqian@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/s390/Kconfig
-+++ b/arch/s390/Kconfig
-@@ -93,6 +93,7 @@ config S390
- select ARCH_SAVE_PAGE_KEYS if HIBERNATION
- select HAVE_MEMBLOCK
- select HAVE_MEMBLOCK_NODE_MAP
-+ select HAVE_ALIGNED_STRUCT_PAGE if SLUB
- select ARCH_DISCARD_MEMBLOCK
- select ARCH_INLINE_SPIN_TRYLOCK
- select ARCH_INLINE_SPIN_TRYLOCK_BH
i7300_edac-fix-error-flag-testing.patch
revert-sched-autogroup-stop-going-ahead-if-autogroup-is-disabled.patch
bnx2x-remove-redundant-warning-log.patch
-s390-mm-have-16-byte-aligned-struct-pages.patch
acpi-missing-break.patch
i915-quirk-no_lvds-on-gigabyte-ga-d525tud-itx-motherboard.patch
drm-i915-add-no-lvds-quirk-for-supermicro-x7spa-h.patch
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -796,6 +796,14 @@ static const struct dmi_system_id intel_
+@@ -788,6 +788,14 @@ static const struct dmi_system_id intel_
DMI_MATCH(DMI_BOARD_NAME, "D525TUD"),
},
},
+++ /dev/null
-From a51d4ed01e5bb39d2cf36a12f9976ab08872c192 Mon Sep 17 00:00:00 2001
-From: Calvin Walton <calvin.walton@kepstin.ca>
-Date: Fri, 24 Aug 2012 07:56:31 -0400
-Subject: i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard
-
-From: Calvin Walton <calvin.walton@kepstin.ca>
-
-commit a51d4ed01e5bb39d2cf36a12f9976ab08872c192 upstream.
-
-This board is incorrectly detected as having an LVDS connector,
-resulting in the VGA output (the only available output on the board)
-showing the console only in the top-left 1024x768 pixels, and an extra
-LVDS connector appearing in X.
-
-It's a desktop Mini-ITX board using an Atom D525 CPU with an NM10
-chipset.
-
-I've had this board for about a year, but this is the first time I
-noticed the issue because I've been running it headless for most of its
-life.
-
-Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
-Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -788,6 +788,14 @@ static const struct dmi_system_id intel_
- DMI_MATCH(DMI_BOARD_NAME, "D525TUD"),
- },
- },
-+ {
-+ .callback = intel_no_lvds_dmi_callback,
-+ .ident = "Gigabyte GA-D525TUD",
-+ .matches = {
-+ DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
-+ DMI_MATCH(DMI_BOARD_NAME, "D525TUD"),
-+ },
-+ },
-
- { } /* terminating entry */
- };
+++ /dev/null
-From 4bffbb3455372a26816e364fb4448810f7014452 Mon Sep 17 00:00:00 2001
-From: Heiko Carstens <heiko.carstens@de.ibm.com>
-Date: Thu, 8 Nov 2012 14:18:47 +0100
-Subject: s390/mm: have 16 byte aligned struct pages
-
-From: Heiko Carstens <heiko.carstens@de.ibm.com>
-
-commit 4bffbb3455372a26816e364fb4448810f7014452 upstream.
-
-Select HAVE_ALIGNED_STRUCT_PAGE on s390, so that the slub allocator can make
-use of compare and swap double for lockless updates. This increases the size
-of struct page to 64 bytes (instead of 56 bytes), however the performance gain
-justifies the increased size:
-
-- now excactly four struct pages fit into a single cache line; the
- case that accessing a struct page causes two cache line loads
- does not exist anymore.
-- calculating the offset of a struct page within the memmap array
- is only a simple shift instead of a more expensive multiplication.
-
-A "hackbench 200 process 200" run on a 32 cpu system did show an 8% runtime
-improvement.
-
-Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-Signed-off-by: CAI Qian <caiqian@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/s390/Kconfig
-+++ b/arch/s390/Kconfig
-@@ -89,6 +89,7 @@ config S390
- select HAVE_MEMBLOCK
- select HAVE_MEMBLOCK_NODE_MAP
- select HAVE_CMPXCHG_LOCAL
-+ select HAVE_ALIGNED_STRUCT_PAGE if SLUB
- select ARCH_DISCARD_MEMBLOCK
- select BUILDTIME_EXTABLE_SORT
- select ARCH_INLINE_SPIN_TRYLOCK
revert-sched-autogroup-stop-going-ahead-if-autogroup-is-disabled.patch
bnx2x-remove-redundant-warning-log.patch
i7core_edac-fix-panic-when-accessing-sysfs-files.patch
-s390-mm-have-16-byte-aligned-struct-pages.patch
net-qmi_wwan-adding-more-zte-devices.patch
net-qmi_wwan-add-huawei-e173.patch
acpi-missing-break.patch
-i915-quirk-no_lvds-on-gigabyte-ga-d525tud-itx-motherboard.patch
drm-i915-add-no-lvds-quirk-for-supermicro-x7spa-h.patch
x86-amd-disable-way-access-filter-on-piledriver-cpus.patch
8139cp-revert-set-ring-address-before-enabling-receiver.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
