Patches contributed by Eötvös Lorand University
commit cbd6712406a3ea861b49fbfd46e23cbf5f8e073f
Merge: d939d2851fd1 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:30:49 2008 +0200
Merge branch 'linus' into x86/irq
commit 48cf937f48f68bd1e61f37c6357dbff5adb95532
Merge: fce39665abb7 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:30:33 2008 +0200
Merge branch 'linus' into x86/i8259
commit 037a6079eb925f7653bddf1501f777abcd4fc91e
Merge: 0754557d72c1 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:30:26 2008 +0200
Merge branch 'linus' into x86/gart
commit 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8
Merge: a1d5a8691f1b 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:30:21 2008 +0200
Merge branch 'linus' into x86/fixmap
commit 28f73e51d0f64a5b896ad816ab8df6f3bcec5810
Merge: f3f3149f35b9 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:30:10 2008 +0200
Merge branch 'linus' into x86/delay
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/tsc_32.c
index 048baab77268,65b70637ad97..0065426f1511
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@@ -402,13 -404,9 +405,10 @@@ static inline void check_geode_tsc_reli
void __init tsc_init(void)
{
int cpu;
+ u64 lpj;
- if (!cpu_has_tsc || tsc_disabled) {
- /* Disable the TSC in case of !cpu_has_tsc */
- tsc_disabled = 1;
+ if (!cpu_has_tsc || tsc_disabled > 0)
return;
- }
cpu_khz = calculate_cpu_khz();
tsc_khz = cpu_khz;
@@@ -418,15 -416,9 +418,13 @@@
return;
}
+ lpj = ((u64)tsc_khz * 1000);
+ do_div(lpj, HZ);
+ lpj_fine = lpj;
+
+ /* now allow native_sched_clock() to use rdtsc */
+ tsc_disabled = 0;
+
printk("Detected %lu.%03lu MHz processor.\n",
(unsigned long)cpu_khz / 1000,
(unsigned long)cpu_khz % 1000);
commit 1262b0088f3c1928c0487d4074c6cda11a8b78c6
Merge: 378fc6eedc00 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:29:32 2008 +0200
Merge branch 'linus' into x86/cleanups
commit 37f5d732f34fa099676b2c52b8a57bab01a011de
Merge: ed9e4996d9a1 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:29:02 2008 +0200
Merge branch 'linus' into tracing/sysprof
commit f4628e644c34d9e6242ea18487b2ed58ee04e3eb
Merge: cb9aa97c21c5 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:28:47 2008 +0200
Merge branch 'linus' into tracing/mmiotrace-mergefixups
commit 97e6722b8d6b5880c4d5751127d5083b1b7df27d
Merge: f22f9a89ce68 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:27:56 2008 +0200
Merge branch 'linus' into tracing/ftrace
commit 5ce001b0e56638c726270d4f9e05d46d4250dfbb
Merge: 7c9f8861e6c9 543cf4cb3fe6
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 25 12:27:29 2008 +0200
Merge branch 'linus' into stackprotector