diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 11:59:37 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 14:20:42 +0200 |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /security/tomoyo/gc.c | |
| parent | time: Remove xtime_cache (diff) | |
| parent | Linux 2.6.34-rc7 (diff) | |
| download | linux-dev-dbb6be6d5e974c42bbecd183effaa0df69e1dd8b.tar.xz linux-dev-dbb6be6d5e974c42bbecd183effaa0df69e1dd8b.zip | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'security/tomoyo/gc.c')
| -rw-r--r-- | security/tomoyo/gc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c index 9645525ccdd4..d9ad35bc7fa8 100644 --- a/security/tomoyo/gc.c +++ b/security/tomoyo/gc.c @@ -9,6 +9,7 @@ #include "common.h" #include <linux/kthread.h> +#include <linux/slab.h> enum tomoyo_gc_id { TOMOYO_ID_DOMAIN_INITIALIZER, |