From 1b813451bd28ef7686abd1d5a83fc66b23166403 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 4 Dec 2007 17:19:07 +0100
Subject: [PATCH] --- yaml --- r: 74557 b: refs/heads/master c:
 ee0011a798ba0e9134506830c58323f2bfcd2443 h: refs/heads/master i:   74555:
 2db64a0364323b617739b766f9044ce725297c28 v: v3

---
 [refs]                           |  2 +-
 trunk/MAINTAINERS                |  7 +++++++
 trunk/arch/x86/Kconfig           |  3 ++-
 trunk/drivers/s390/net/ctcmain.c |  1 +
 trunk/kernel/sched.c             | 14 +++++---------
 trunk/kernel/sched_fair.c        |  7 +++----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 680fd615ab22..3521592e9d81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa
+refs/heads/master: ee0011a798ba0e9134506830c58323f2bfcd2443
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 3002cc811c10..2bbe40ea4d10 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2598,6 +2598,13 @@ L:	https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:	http://0pointer.de/lennart/tchibo.html
 S:	Maintained
 
+MTRR AND SIMILAR SUPPORT [i386]
+P:	Richard Gooch
+M:	rgooch@atnf.csiro.au
+L:	linux-kernel@vger.kernel.org
+W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
+S:	Maintained
+
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:	Pierre Ossman
 M:	drzeus-mmc@drzeus.cx
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 368864dfe6eb..391cb1894127 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -148,7 +148,8 @@ config X86_SMP
 
 config X86_HT
 	bool
-	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
+	depends on SMP
+	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
 	default y
 
 config X86_BIOS_REBOOT
diff --git a/trunk/drivers/s390/net/ctcmain.c b/trunk/drivers/s390/net/ctcmain.c
index 97adc701a819..b3b6f654365c 100644
--- a/trunk/drivers/s390/net/ctcmain.c
+++ b/trunk/drivers/s390/net/ctcmain.c
@@ -2802,6 +2802,7 @@ void ctc_init_netdevice(struct net_device * dev)
 	dev->type = ARPHRD_SLIP;
 	dev->tx_queue_len = 100;
 	dev->flags = IFF_POINTOPOINT | IFF_NOARP;
+	SET_MODULE_OWNER(dev);
 }
 
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index b062856b946c..59ff6b140edb 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4850,21 +4850,17 @@ long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval)
 	if (retval)
 		goto out_unlock;
 
-	/*
-	 * Time slice is 0 for SCHED_FIFO tasks and for SCHED_OTHER
-	 * tasks that are on an otherwise idle runqueue:
-	 */
-	time_slice = 0;
-	if (p->policy == SCHED_RR) {
+	if (p->policy == SCHED_FIFO)
+		time_slice = 0;
+	else if (p->policy == SCHED_RR)
 		time_slice = DEF_TIMESLICE;
-	} else {
+	else {
 		struct sched_entity *se = &p->se;
 		unsigned long flags;
 		struct rq *rq;
 
 		rq = task_rq_lock(p, &flags);
-		if (rq->cfs.load.weight)
-			time_slice = NS_TO_JIFFIES(sched_slice(&rq->cfs, se));
+		time_slice = NS_TO_JIFFIES(sched_slice(cfs_rq_of(se), se));
 		task_rq_unlock(rq, &flags);
 	}
 	read_unlock(&tasklist_lock);
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index c33f0ceb3de9..37bb265598db 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -799,9 +799,8 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep)
  */
 static void yield_task_fair(struct rq *rq)
 {
-	struct task_struct *curr = rq->curr;
-	struct cfs_rq *cfs_rq = task_cfs_rq(curr);
-	struct sched_entity *rightmost, *se = &curr->se;
+	struct cfs_rq *cfs_rq = task_cfs_rq(rq->curr);
+	struct sched_entity *rightmost, *se = &rq->curr->se;
 
 	/*
 	 * Are we the only task in the tree?
@@ -809,7 +808,7 @@ static void yield_task_fair(struct rq *rq)
 	if (unlikely(cfs_rq->nr_running == 1))
 		return;
 
-	if (likely(!sysctl_sched_compat_yield) && curr->policy != SCHED_BATCH) {
+	if (likely(!sysctl_sched_compat_yield)) {
 		__update_rq_clock(rq);
 		/*
 		 * Update run-time statistics of the 'current'.