diff --git a/kernel.spec b/kernel.spec index d8b034b..3b299f9 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 7 +%global baserelease 8 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -62,7 +62,7 @@ Summary: The Linux kernel # Do we have a -stable update to apply? %define stable_update 2 # Is it a -stable RC? -%define stable_rc 1 +%define stable_rc 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -597,8 +597,6 @@ Patch09: linux-2.6-upstream-reverts.patch # Standalone patches Patch20: linux-2.6-hotfixes.patch -Patch21: linux-2.6-tip.git-396e894d289d69bacf5acd983c97cd6e21a14c08.patch - Patch30: git-utrace.patch Patch31: utrace-ptrace-fix-build.patch Patch32: utrace-remove-use-of-kref_set.patch @@ -687,7 +685,6 @@ Patch2915: lirc-staging-2.6.36.patch Patch2917: hdpvr-ir-enable.patch # fs fixes -Patch3000: linux-2.6-ext4-fix-freeze-deadlock.patch # NFSv4 @@ -1130,8 +1127,6 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyPatch linux-2.6-hotfixes.patch -#ApplyPatch linux-2.6-tip.git-396e894d289d69bacf5acd983c97cd6e21a14c08.patch - # Roland's utrace ptrace replacement. ApplyPatch git-utrace.patch ApplyPatch utrace-ptrace-fix-build.patch @@ -1164,7 +1159,6 @@ ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch # # ext4 -#ApplyPatch linux-2.6-ext4-fix-freeze-deadlock.patch # xfs @@ -1890,6 +1884,9 @@ fi # and build. %changelog +* Sun Aug 15 2010 Chuck Ebbert 2.6.35.2-8 +- Linux 2.6.35.2 + * Fri Aug 13 2010 Chuck Ebbert 2.6.35.2-7.rc1 - Linux 2.6.35.2-rc1 - Comment out patches merged in -stable: diff --git a/linux-2.6-ext4-fix-freeze-deadlock.patch b/linux-2.6-ext4-fix-freeze-deadlock.patch deleted file mode 100644 index e7eb817..0000000 --- a/linux-2.6-ext4-fix-freeze-deadlock.patch +++ /dev/null @@ -1,46 +0,0 @@ -[PATCH] ext4: fix freeze deadlock under IO - -Commit 6b0310fbf087ad6 caused a regression resulting in deadlocks -when freezing a filesystem which had active IO; the vfs_check_frozen -level (SB_FREEZE_WRITE) did not let the freeze-related IO syncing -through. Duh. - -Changing the test to FREEZE_TRANS should let the normal freeze -syncing get through the fs, but still block any transactions from -starting once the fs is completely frozen. - -I tested this by running fsstress in the background while periodically -snapshotting the fs and running fsck on the result. I ran into -occasional deadlocks, but different ones. I think this is a -fine fix for the problem at hand, and the other deadlocky things -will need more investigation. - -Reported-by: Phillip Susi -Signed-off-by: Eric Sandeen ---- - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 4e8983a..a45ced9 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -241,7 +241,7 @@ handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks) - if (sb->s_flags & MS_RDONLY) - return ERR_PTR(-EROFS); - -- vfs_check_frozen(sb, SB_FREEZE_WRITE); -+ vfs_check_frozen(sb, SB_FREEZE_TRANS); - /* Special case here: if the journal has aborted behind our - * backs (eg. EIO in the commit thread), then we still need to - * take the FS itself readonly cleanly. */ -@@ -3491,7 +3491,7 @@ int ext4_force_commit(struct super_block *sb) - - journal = EXT4_SB(sb)->s_journal; - if (journal) { -- vfs_check_frozen(sb, SB_FREEZE_WRITE); -+ vfs_check_frozen(sb, SB_FREEZE_TRANS); - ret = ext4_journal_force_commit(journal); - } - - - - diff --git a/linux-2.6-tip.git-396e894d289d69bacf5acd983c97cd6e21a14c08.patch b/linux-2.6-tip.git-396e894d289d69bacf5acd983c97cd6e21a14c08.patch deleted file mode 100644 index c13d987..0000000 --- a/linux-2.6-tip.git-396e894d289d69bacf5acd983c97cd6e21a14c08.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Peter Zijlstra -Date: Fri, 9 Jul 2010 13:12:27 +0000 (+0200) -Subject: sched: Revert nohz_ratelimit() for now -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git;a=commitdiff_plain;h=396e894d289d69bacf5acd983c97cd6e21a14c08 - -sched: Revert nohz_ratelimit() for now - -Norbert reported that nohz_ratelimit() causes his laptop to burn about -4W (40%) extra. For now back out the change and see if we can adjust -the power management code to make better decisions. - -Reported-by: Norbert Preining -Signed-off-by: Peter Zijlstra -Acked-by: Mike Galbraith -Cc: Arjan van de Ven -LKML-Reference: -Signed-off-by: Ingo Molnar ---- - -diff --git a/include/linux/sched.h b/include/linux/sched.h -index 747fcae..6e0bb86 100644 ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -273,17 +273,11 @@ extern cpumask_var_t nohz_cpu_mask; - #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) - extern int select_nohz_load_balancer(int cpu); - extern int get_nohz_load_balancer(void); --extern int nohz_ratelimit(int cpu); - #else - static inline int select_nohz_load_balancer(int cpu) - { - return 0; - } -- --static inline int nohz_ratelimit(int cpu) --{ -- return 0; --} - #endif - - /* -diff --git a/kernel/sched.c b/kernel/sched.c -index f52a880..63b4a14 100644 ---- a/kernel/sched.c -+++ b/kernel/sched.c -@@ -1232,16 +1232,6 @@ void wake_up_idle_cpu(int cpu) - smp_send_reschedule(cpu); - } - --int nohz_ratelimit(int cpu) --{ -- struct rq *rq = cpu_rq(cpu); -- u64 diff = rq->clock - rq->nohz_stamp; -- -- rq->nohz_stamp = rq->clock; -- -- return diff < (NSEC_PER_SEC / HZ) >> 1; --} -- - #endif /* CONFIG_NO_HZ */ - - static u64 sched_avg_period(void) -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index 813993b..f898af6 100644 ---- a/kernel/time/tick-sched.c -+++ b/kernel/time/tick-sched.c -@@ -325,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle) - } while (read_seqretry(&xtime_lock, seq)); - - if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) || -- arch_needs_cpu(cpu) || nohz_ratelimit(cpu)) { -+ arch_needs_cpu(cpu)) { - next_jiffies = last_jiffies + 1; - delta_jiffies = 1; - } else { diff --git a/sources b/sources index 26e3dd1..8241487 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 -3b9d79bebb2e022c0906ca1cd54bd970 patch-2.6.35.1.bz2 -b930a0ff7060566bb2f91755c86de196 patch-2.6.35.2-rc1.bz2 +c0d9ece021feaf0b86c031ab59840ea8 patch-2.6.35.2.bz2