diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-04-30 01:53:17 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-30 01:53:17 +0200 |
| commit | d9c5841e22231e4e49fd0a1004164e6fce59b7a6 (patch) | |
| tree | e1f589c46b3ff79bbe7b1b2469f6362f94576da6 /lib/scatterlist.c | |
| parent | x86: Fix LOCK_PREFIX_HERE for uniprocessor build (diff) | |
| parent | x86-64: Reduce SMP locks table size (diff) | |
| download | linux-d9c5841e22231e4e49fd0a1004164e6fce59b7a6.tar.xz linux-d9c5841e22231e4e49fd0a1004164e6fce59b7a6.zip | |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'lib/scatterlist.c')
| -rw-r--r-- | lib/scatterlist.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 0d475d8167bf..9afa25b52a83 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -7,6 +7,7 @@ * Version 2. See the file COPYING for more details. */ #include <linux/module.h> +#include <linux/slab.h> #include <linux/scatterlist.h> #include <linux/highmem.h> |