diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/alpha/include/asm/tlbflush.h | |
| parent | percpu: don't assume existence of cpu0 (diff) | |
| parent | powerpc64: convert to dynamic percpu allocator (diff) | |
| download | linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'arch/alpha/include/asm/tlbflush.h')
| -rw-r--r-- | arch/alpha/include/asm/tlbflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/tlbflush.h b/arch/alpha/include/asm/tlbflush.h index 9d87aaa08c0d..e89e0c2e15b1 100644 --- a/arch/alpha/include/asm/tlbflush.h +++ b/arch/alpha/include/asm/tlbflush.h @@ -2,6 +2,7 @@ #define _ALPHA_TLBFLUSH_H #include <linux/mm.h> +#include <linux/sched.h> #include <asm/compiler.h> #include <asm/pgalloc.h> |