Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee3af6ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of... 

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
parents 13bba6fd 92d23f70 d80c19df

kernel/lockdep_internals.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

kernel/sched_clock.c

+2 −1
Original line number Diff line number Diff line
@@ -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;