Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix fallback sched_clock()'s offset when using jiffies

* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
Linus Torvalds 16 years ago
parent
13bba6fda9 92d23f703c d80c19df5f
commit
ee3af6ee77
2 changed files with 4 additions and 3 deletions
Split View Show Diff Stats
  1. 2 2
      kernel/lockdep_internals.h
  2. 2 1
      kernel/sched_clock.c

+ 2 - 2
kernel/lockdep_internals.h
View File 

@@ -54,9 +54,9 @@ enum {
 
  * table (if it's not there yet), and we check it for lock order
 
  * conflicts and deadlocks.
 
  */
 
-#define MAX_LOCKDEP_ENTRIES	8192UL
 
+#define MAX_LOCKDEP_ENTRIES	16384UL
 
 
-#define MAX_LOCKDEP_CHAINS_BITS	14
 
+#define MAX_LOCKDEP_CHAINS_BITS	15
 
 #define MAX_LOCKDEP_CHAINS	(1UL << MAX_LOCKDEP_CHAINS_BITS)
 
 
 #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)

+ 2 - 1
kernel/sched_clock.c
View File 

@@ -38,7 +38,8 @@
 
  */
 
 unsigned long long __attribute__((weak)) sched_clock(void)
 
 {
 
-	return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
 
+	return (unsigned long long)(jiffies - INITIAL_JIFFIES)
 
+					* (NSEC_PER_SEC / HZ);
 
 }
 
 
 static __read_mostly int sched_clock_running;