Patches contributed by Eötvös Lorand University
commit 773dc8eacaedb2e8c8d0defb5de2c66ea7dc4a08
Merge: 961ccddd59d6 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:27:05 2008 +0200
Merge branch 'linus' into sched/new-API-sched_setscheduler
commit f57aec5a871907427060196f6bac3d0011b38450
Merge: 1de8644cc7c8 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:26:59 2008 +0200
Merge branch 'linus' into sched/devel
Conflicts:
kernel/sched_rt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ace7f1b79670aa0c1d9f4b0442be82e565827333
Merge: a60b33cf59d1 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:23:59 2008 +0200
Merge branch 'linus' into core/softirq
commit d02859ecb321c8c0f74cb9bbe3f51a59e58822b0
Merge: a987b16cc612 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:16:51 2008 +0200
Merge commit 'v2.6.26-rc8' into x86/xen
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 6ff10de374cc68ff2024247793176dc8a1b317ea
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jun 24 01:19:49 2008 +0200
x86: fix "x86: use cpu_khz for loops_per_jiffy calculation"
fix:
arch/x86/kernel/tsc_32.c: In function ‘tsc_init':
arch/x86/kernel/tsc_32.c:421: error: ‘lpj_tsc' undeclared (first use in this function)
arch/x86/kernel/tsc_32.c:421: error: (Each undeclared identifier is reported only once
arch/x86/kernel/tsc_32.c:421: error: for each function it appears in.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index be729035b30b..0af49fb533e1 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/clocksource.h>
#include <linux/workqueue.h>
+#include <linux/delay.h>
#include <linux/cpufreq.h>
#include <linux/jiffies.h>
#include <linux/init.h>
commit 009b9fc98ddd83f9139fdabb12c0d7a8535d5421
Merge: 3711ccb07b7f 481c5346d098
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 23 11:53:03 2008 +0200
Merge branch 'linus' into x86/threadinfo
diff --cc include/asm-x86/page_32.h
index 50b33ebcf851,ccf0ba3c3aba..73ed2e4ebf95
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@@ -13,16 -13,9 +13,17 @@@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
+#ifdef CONFIG_4KSTACKS
+#define THREAD_ORDER 0
+#else
+#define THREAD_ORDER 1
+#endif
+#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
+
+
#ifdef CONFIG_X86_PAE
- #define __PHYSICAL_MASK_SHIFT 36
+ /* 44=32+12, the limit we can fit into an unsigned long pfn */
+ #define __PHYSICAL_MASK_SHIFT 44
#define __VIRTUAL_MASK_SHIFT 32
#define PAGETABLE_LEVELS 3
commit 1de8644cc7c826e0c41e52825bd5a12e2e31e6ca
Merge: 6c3df25511c2 481c5346d098
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 23 11:30:23 2008 +0200
Merge branch 'linus' into sched/devel
commit 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8
Merge: 31a72bce0bd6 481c5346d098
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 23 11:29:11 2008 +0200
Merge branch 'linus' into core/rcu
commit f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d
Merge: ee4311adf105 481c5346d098
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 23 11:11:42 2008 +0200
Merge branch 'linus' into tracing/ftrace
commit 198bb971e256e4167e45e7df643c13ea66f67e3a
Merge: ea71a546706d 481c5346d098
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 23 11:00:26 2008 +0200
Merge branch 'linus' into sched/urgent