diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 15:27:05 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 15:29:05 (GMT) |
| commit | 5306293c9cd2caf41849cc909281bda628bb989e (patch) | |
| tree | 3be4e8231e2772c8a43ddbef5c6a72c20b3054bb /arch/sparc/mm/tsb.c | |
| parent | dbd65a7e44fff4741a0b2c84bd6bace85d22c242 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | linux-fsl-qoriq-5306293c9cd2caf41849cc909281bda628bb989e.tar.xz | |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
Diffstat (limited to 'arch/sparc/mm/tsb.c')
| -rw-r--r-- | arch/sparc/mm/tsb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c index 36a0813..101d7c8 100644 --- a/arch/sparc/mm/tsb.c +++ b/arch/sparc/mm/tsb.c @@ -5,6 +5,7 @@ #include <linux/kernel.h> #include <linux/preempt.h> +#include <linux/slab.h> #include <asm/system.h> #include <asm/page.h> #include <asm/tlbflush.h> |