[kernel/f14/master] update to 2.6.35.12
Kyle McMartin
kyle at fedoraproject.org
Thu Mar 31 21:05:00 UTC 2011
commit 3472dfdd752e2e37edd2b2dc477fe946922b5c7c
Author: Kyle McMartin <kyle at redhat.com>
Date: Thu Mar 31 17:04:46 2011 -0400
update to 2.6.35.12
add-macbookair3-ids.patch | 263 --------------------
...211-fix-can_beacon_sec_chan-reenable-ht40.patch | 46 ----
config-x86-generic | 2 +
config-x86_64-generic | 2 +
...-security_d_instantiate-in-d_obtain_alias.patch | 65 -----
...ping-function-called-from-invalid-context.patch | 76 ------
iwl3945-remove-plcp-check.patch | 36 ---
kernel.spec | 46 +---
kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch | 161 ------------
linux-2.6-upstream-reverts.patch | 193 ++++++++++++++
...lock-synchronization-when-migrating-tasks.patch | 8 +-
...-move-sched_avg_update-to-update_cpu_load.patch | 58 -----
...ment-cache_nice_tries-only-on-periodic-lb.patch | 93 -------
sources | 2 +-
tpm-fix-stall-on-boot.patch | 24 --
15 files changed, 207 insertions(+), 868 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index f1686da..65e788a 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -492,3 +492,5 @@ CONFIG_LPC_SCH=m
CONFIG_INTEL_IDLE=y
CONFIG_PCI_CNB20LE_QUIRK=y
+
+CONFIG_IRQ_TIME_ACCOUNTING=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 79b74c2..4c4924c 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -409,3 +409,5 @@ CONFIG_I7300_IDLE=m
CONFIG_PCI_CNB20LE_QUIRK=y
CONFIG_HP_ILO=m
+
+CONFIG_IRQ_TIME_ACCOUNTING=y
diff --git a/kernel.spec b/kernel.spec
index 06c837f..0951de2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 87
+%global baserelease 88
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -60,7 +60,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 11
+%define stable_update 12
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -763,13 +763,10 @@ Patch12565: sched-05-avoid-side-effect-of-tickless-idle-on-update_cpu_load.patch
Patch12570: sched-10-change-nohz-idle-load-balancing-logic-to-push-model.patch
Patch12575: sched-15-update-rq-clock-for-nohz-balanced-cpus.patch
Patch12580: sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
-Patch12585: sched-25-move-sched_avg_update-to-update_cpu_load.patch
Patch12590: sched-30-sched-fix-nohz-balance-kick.patch
-Patch12595: sched-35-increment-cache_nice_tries-only-on-periodic-lb.patch
Patch13600: btusb-macbookpro-6-2.patch
Patch13601: btusb-macbookpro-7-1.patch
-Patch13602: add-macbookair3-ids.patch
Patch13610: libata-it821x-dump-stack-on-cache-flush.patch
@@ -784,9 +781,6 @@ Patch13641: mmc-make-sdhci-work-with-ricoh-mmc-controller.patch
Patch13642: mmc-add-ricoh-e822-pci-id.patch
Patch13645: tpm-autodetect-itpm-devices.patch
-Patch13646: tpm-fix-stall-on-boot.patch
-
-Patch13651: kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
Patch13652: fix-i8k-inline-asm.patch
@@ -810,8 +804,6 @@ Patch13694: btrfs-fix-error-handling-in-btrfs_get_sub.patch
Patch13695: btrfs-setup-blank-root-and-fs_info-for-mount-time.patch
Patch13696: btrfs-fix-race-between-btrfs_get_sb-and-unmount.patch
-Patch13697: fs-call-security_d_instantiate-in-d_obtain_alias.patch
-
Patch13698: net-AF_PACKET-vmalloc.patch
# rhbz#652744
@@ -824,9 +816,6 @@ Patch13702: block-check-for-proper-length-of-iov-entries-earlier-in-blk_rq_map_u
# RHBZ #669511
Patch13703: btrfs-fix-typo-in-fallocate-to-make-it-honor-actual-size.patch
-# rhbz#643758
-Patch13704: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
-
# rhbz #673207
Patch13705: sunrpc-kernel-panic-when-mount-nfsv4.patch
@@ -839,18 +828,12 @@ Patch13707: kvm-mmu-fix-32-bit-legacy-paging-with-npt.patch
# rhbz#676860
Patch13708: hid-force-feedback-support-for-logitech-rumblepad-gamepad.patch
-# rhbz#654599
-Patch13709: iwl3945-remove-plcp-check.patch
-
# rhbz#604630
Patch13710: linux-2.6-bonding-sysfs-warning.patch
# rhbz#680791
Patch13711: md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.patch
-# rhbz#671514
-Patch13712: cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
-
Patch13713: virtio_net-add-schedule-check-to-napi_enable-call.patch
%endif
@@ -1314,9 +1297,6 @@ ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
# bugfixes to drivers and filesystems
#
-# rhbz#662344,600690
-ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
-
# ext4
# rhbz#578674
@@ -1519,16 +1499,11 @@ ApplyPatch sched-05-avoid-side-effect-of-tickless-idle-on-update_cpu_load.patch
ApplyPatch sched-10-change-nohz-idle-load-balancing-logic-to-push-model.patch
ApplyPatch sched-15-update-rq-clock-for-nohz-balanced-cpus.patch
ApplyPatch sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
-ApplyPatch sched-25-move-sched_avg_update-to-update_cpu_load.patch
ApplyPatch sched-30-sched-fix-nohz-balance-kick.patch
-ApplyPatch sched-35-increment-cache_nice_tries-only-on-periodic-lb.patch
ApplyPatch btusb-macbookpro-7-1.patch
ApplyPatch btusb-macbookpro-6-2.patch
-# rhbz#651019
-ApplyPatch add-macbookair3-ids.patch
-
# temporary patch, dump stack on failed it821x commands
ApplyPatch libata-it821x-dump-stack-on-cache-flush.patch
@@ -1546,11 +1521,6 @@ ApplyPatch mmc-make-sdhci-work-with-ricoh-mmc-controller.patch
ApplyPatch mmc-add-ricoh-e822-pci-id.patch
ApplyPatch tpm-autodetect-itpm-devices.patch
-# rhbz#530393
-ApplyPatch tpm-fix-stall-on-boot.patch
-
-# CVE-2010-3698
-ApplyPatch kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
ApplyPatch fix-i8k-inline-asm.patch
@@ -1582,9 +1552,6 @@ ApplyPatch e1000e-82566DC-fails-to-get-link.patch
# CVE-2010-4668
ApplyPatch block-check-for-proper-length-of-iov-entries-earlier-in-blk_rq_map_user_iov.patch
-# rhbz#643758
-ApplyPatch hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
-
# rhbz #673207
ApplyPatch sunrpc-kernel-panic-when-mount-nfsv4.patch
@@ -1597,18 +1564,12 @@ ApplyPatch kvm-mmu-fix-32-bit-legacy-paging-with-npt.patch
# rhbz#676860
ApplyPatch hid-force-feedback-support-for-logitech-rumblepad-gamepad.patch
-# rhbz#654599
-ApplyPatch iwl3945-remove-plcp-check.patch
-
# rhbz#604630
ApplyPatch linux-2.6-bonding-sysfs-warning.patch
# rhbz#680791
ApplyPatch md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.patch
-# rhbz#671514
-ApplyPatch cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
-
ApplyPatch virtio_net-add-schedule-check-to-napi_enable-call.patch
# END OF PATCH APPLICATIONS
@@ -2197,6 +2158,9 @@ fi
# and build.
%changelog
+* Thu Mar 31 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.35.12-88
+- Update to longterm 2.6.35.12, drop upstream patches.
+
* Wed Mar 23 2011 Kyle McMartin <kmcmartin at redhat.com>
- Backport 3e9d08e: "virtio_net: Add schedule check to napi_enable call"
diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch
index 9eb4848..50f70fd 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/linux-2.6-upstream-reverts.patch
@@ -137,3 +137,196 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
/* Channel's PRAMIN object + heap */
ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
NULL, &chan->ramin);
+
+commit 6f1b1e1384b23cfab30c2bc02a8f94927274c10d
+Author: Geert Uytterhoeven <geert at linux-m68k.org>
+Date: Sun Jan 16 10:09:13 2011 -0300
+
+ radio-aimslab.c needs #include <linux/delay.h>
+
+ commit 2400982a2e8a8e4e95f0a0e1517bbe63cc88038f upstream.
+
+ Commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f ("[media] radio-aimslab.c: Fix
+ gcc 4.5+ bug") removed the include, but introduced new callers of msleep():
+
+ | drivers/media/radio/radio-aimslab.c: In function ‘rt_decvol’:
+ | drivers/media/radio/radio-aimslab.c:76: error: implicit declaration of function ‘msleep’
+
+ Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+ Signed-off-by: Andi Kleen <ak at linux.intel.com>
+ Cc: dann frazier <dannf at debian.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
+index 1944814..a91642c 100644
+--- a/drivers/media/radio/radio-aimslab.c
++++ b/drivers/media/radio/radio-aimslab.c
+@@ -31,6 +31,7 @@
+ #include <linux/module.h> /* Modules */
+ #include <linux/init.h> /* Initdata */
+ #include <linux/ioport.h> /* request_region */
++#include <linux/delay.h> /* msleep */
+ #include <linux/videodev2.h> /* kernel radio structs */
+ #include <linux/version.h> /* for KERNEL_VERSION MACRO */
+ #include <linux/io.h> /* outb, outb_p */
+
+commit 9c198dad83c19a05a11b5a195242f3e8dcbe55f4
+Author: Mauro Carvalho Chehab <mchehab at redhat.com>
+Date: Thu Jan 6 08:16:04 2011 -0200
+
+ radio-aimslab.c: Fix gcc 4.5+ bug
+
+ commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f upstream.
+
+ gcc 4.5+ doesn't properly evaluate some inlined expressions.
+ A previous patch were proposed by Andrew Morton using noinline.
+ However, the entire inlined function is bogus, so let's just
+ remove it and be happy.
+
+ Reported-by: Andrew Morton <akpm at linux-foundation.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+ Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
+index 5bf4985..1944814 100644
+--- a/drivers/media/radio/radio-aimslab.c
++++ b/drivers/media/radio/radio-aimslab.c
+@@ -31,7 +31,6 @@
+ #include <linux/module.h> /* Modules */
+ #include <linux/init.h> /* Initdata */
+ #include <linux/ioport.h> /* request_region */
+-#include <linux/delay.h> /* udelay */
+ #include <linux/videodev2.h> /* kernel radio structs */
+ #include <linux/version.h> /* for KERNEL_VERSION MACRO */
+ #include <linux/io.h> /* outb, outb_p */
+@@ -71,27 +70,17 @@ static struct rtrack rtrack_card;
+
+ /* local things */
+
+-static void sleep_delay(long n)
+-{
+- /* Sleep nicely for 'n' uS */
+- int d = n / msecs_to_jiffies(1000);
+- if (!d)
+- udelay(n);
+- else
+- msleep(jiffies_to_msecs(d));
+-}
+-
+ static void rt_decvol(struct rtrack *rt)
+ {
+ outb(0x58, rt->io); /* volume down + sigstr + on */
+- sleep_delay(100000);
++ msleep(100);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+ static void rt_incvol(struct rtrack *rt)
+ {
+ outb(0x98, rt->io); /* volume up + sigstr + on */
+- sleep_delay(100000);
++ msleep(100);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+@@ -120,7 +109,7 @@ static int rt_setvol(struct rtrack *rt, int vol)
+
+ if (vol == 0) { /* volume = 0 means mute the card */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- sleep_delay(2000000); /* make sure it's totally down */
++ msleep(2000); /* make sure it's totally down */
+ outb(0xd0, rt->io); /* volume steady, off */
+ rt->curvol = 0; /* track the volume state! */
+ mutex_unlock(&rt->lock);
+@@ -155,7 +144,7 @@ static void send_0_byte(struct rtrack *rt)
+ outb_p(128+64+16+8+ 1, rt->io); /* on + wr-enable + data low */
+ outb_p(128+64+16+8+2+1, rt->io); /* clock */
+ }
+- sleep_delay(1000);
++ msleep(1);
+ }
+
+ static void send_1_byte(struct rtrack *rt)
+@@ -169,7 +158,7 @@ static void send_1_byte(struct rtrack *rt)
+ outb_p(128+64+16+8+4+2+1, rt->io); /* clock */
+ }
+
+- sleep_delay(1000);
++ msleep(1);
+ }
+
+ static int rt_setfreq(struct rtrack *rt, unsigned long freq)
+@@ -427,7 +416,7 @@ static int __init rtrack_init(void)
+
+ /* this ensures that the volume is all the way down */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- sleep_delay(2000000); /* make sure it's totally down */
++ msleep(2000); /* make sure it's totally down */
+ outb(0xc0, rt->io); /* steady volume, mute card */
+
+ return 0;
+
+commit 515884e98dc4f1c99387000d420394c3bc47c0d7
+Author: Dan Carpenter <error27 at gmail.com>
+Date: Fri Jan 7 16:41:54 2011 -0300
+
+ av7110: check for negative array offset
+
+ commit cb26a24ee9706473f31d34cc259f4dcf45cd0644 upstream.
+
+ info->num comes from the user. It's type int. If the user passes
+ in a negative value that would cause memory corruption.
+
+ Signed-off-by: Dan Carpenter <error27 at gmail.com>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+ Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
+index 4eba35a..c38dd67 100644
+--- a/drivers/media/dvb/ttpci/av7110_ca.c
++++ b/drivers/media/dvb/ttpci/av7110_ca.c
+@@ -277,7 +277,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg)
+ {
+ ca_slot_info_t *info=(ca_slot_info_t *)parg;
+
+- if (info->num > 1)
++ if (info->num < 0 || info->num > 1)
+ return -EINVAL;
+ av7110->ci_slot[info->num].num = info->num;
+ av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ?
+
+commit 9e5ad61f8d81da0b58535ac2cf60d36e26ca567a
+Author: Mauro Carvalho Chehab <mchehab at redhat.com>
+Date: Mon Oct 25 17:51:15 2010 -0300
+
+ em28xx: Fix audio input for Terratec Grabby
+
+ commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 upstream.
+
+ The audio input line was wrong. Fix it.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+ Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
+index 3a4fd85..2fa5bb4 100644
+--- a/drivers/media/video/em28xx/em28xx-cards.c
++++ b/drivers/media/video/em28xx/em28xx-cards.c
+@@ -1605,11 +1605,11 @@ struct em28xx_board em28xx_boards[] = {
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+- .amux = EM28XX_AMUX_VIDEO2,
++ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+- .amux = EM28XX_AMUX_VIDEO2,
++ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ },
+ [EM2860_BOARD_TERRATEC_AV350] = {
diff --git a/sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch b/sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
index 466dd2d..bcdaac9 100644
--- a/sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
+++ b/sched-20-fix-rq-clock-synchronization-when-migrating-tasks.patch
@@ -24,15 +24,15 @@ Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
-index 806d1b2..ab661eb 100644
+index 09a9811..6cebdf8 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
-@@ -3752,6 +3752,8 @@ static void task_fork_fair(struct task_struct *p)
+@@ -3609,6 +3609,8 @@ static void task_fork_fair(struct task_struct *p)
raw_spin_lock_irqsave(&rq->lock, flags);
+ update_rq_clock(rq);
+
- if (unlikely(task_cpu(p) != this_cpu))
+ if (unlikely(task_cpu(p) != this_cpu)) {
+ rcu_read_lock();
__set_task_cpu(p, this_cpu);
-
diff --git a/sources b/sources
index 5f39778..3cdf638 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-573170b7d56d30d06d26b705d4794615 patch-2.6.35.11.bz2
+c835a799c89c296b332077a5390fcc68 patch-2.6.35.12.bz2
More information about the scm-commits
mailing list