lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-05-18 10:11:06 -07:00
parent 13bba6fda9 92d23f703c d80c19df5f
commit ee3af6ee77
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 * table (if it's not there yet), and we check it for lock order
* conflicts and deadlocks. * 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_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)
#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5) #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)

3
kernel/sched_clock.c
View File

@@ -38,7 +38,8 @@
*/ */
unsigned long long __attribute__((weak)) sched_clock(void) 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; static __read_mostly int sched_clock_running;