diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /include/linux/kernel.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
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 |