← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to debian/patches/features/all/rt/cond-resched-softirq-rt.patch

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features/all/rt/cond-resched-softirq-rt.patch
5
5
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
6
6
---
7
7
 include/linux/sched.h |    4 ++++
8
 
 kernel/sched.c        |    2 ++
 
8
 kernel/sched/core.c   |    2 ++
9
9
 2 files changed, 6 insertions(+)
10
10
 
11
 
Index: linux-3.2/include/linux/sched.h
 
11
Index: linux-3.4/include/linux/sched.h
12
12
===================================================================
13
 
--- linux-3.2.orig/include/linux/sched.h
14
 
+++ linux-3.2/include/linux/sched.h
15
 
@@ -2602,12 +2602,16 @@ extern int __cond_resched_lock(spinlock_
 
13
--- linux-3.4.orig/include/linux/sched.h
 
14
+++ linux-3.4/include/linux/sched.h
 
15
@@ -2700,12 +2700,16 @@ extern int __cond_resched_lock(spinlock_
16
16
        __cond_resched_lock(lock);                              \
17
17
 })
18
18
 
29
29
 
30
30
 /*
31
31
  * Does a critical section need to be broken due to another
32
 
Index: linux-3.2/kernel/sched.c
 
32
Index: linux-3.4/kernel/sched/core.c
33
33
===================================================================
34
 
--- linux-3.2.orig/kernel/sched.c
35
 
+++ linux-3.2/kernel/sched.c
36
 
@@ -5826,6 +5826,7 @@ int __cond_resched_lock(spinlock_t *lock
 
34
--- linux-3.4.orig/kernel/sched/core.c
 
35
+++ linux-3.4/kernel/sched/core.c
 
36
@@ -4605,6 +4605,7 @@ int __cond_resched_lock(spinlock_t *lock
37
37
 }
38
38
 EXPORT_SYMBOL(__cond_resched_lock);
39
39
 
41
41
 int __sched __cond_resched_softirq(void)
42
42
 {
43
43
        BUG_ON(!in_softirq());
44
 
@@ -5839,6 +5840,7 @@ int __sched __cond_resched_softirq(void)
 
44
@@ -4618,6 +4619,7 @@ int __sched __cond_resched_softirq(void)
45
45
        return 0;
46
46
 }
47
47
 EXPORT_SYMBOL(__cond_resched_softirq);