diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /include/linux/kernel.h | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5a566b705ca9..94d17ff64c5a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -496,4 +496,9 @@ struct sysinfo { | |||
| 496 | #define NUMA_BUILD 0 | 496 | #define NUMA_BUILD 0 |
| 497 | #endif | 497 | #endif |
| 498 | 498 | ||
| 499 | /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ | ||
| 500 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | ||
| 501 | # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD | ||
| 502 | #endif | ||
| 503 | |||
| 499 | #endif | 504 | #endif |