diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-31 22:05:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-31 22:05:48 +0100 |
| commit | 62152d0ea7012382cd814c7b361b4ef2029f26e6 (patch) | |
| tree | 2552f298c9c5c1f9be6d863d58ab5b4c0b24c37f | |
| parent | 5aa0508508e7cd62bec6e3933b86fce03d2e8502 (diff) | |
| download | linux-3.10-62152d0ea7012382cd814c7b361b4ef2029f26e6.tar.gz linux-3.10-62152d0ea7012382cd814c7b361b4ef2029f26e6.tar.bz2 linux-3.10-62152d0ea7012382cd814c7b361b4ef2029f26e6.zip | |
asm-generic/tlb.h: build fix
bring back the avr32, blackfin, sh, sparc architectures into working order,
by reverting the effects of this change that came in via the x86 tree:
commit a5a19c63f4e55e32dc0bc3d936d7f94793d8b380
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed Jan 30 13:33:39 2008 +0100
x86: demacro asm-x86/pgalloc_32.h
Sorry about that!
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-generic/tlb.h | 1 | ||||
| -rw-r--r-- | include/linux/swap.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 6ce9f3ab928..75f2bfab614 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -15,6 +15,7 @@ #include <linux/swap.h> #include <linux/quicklist.h> +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /* diff --git a/include/linux/swap.h b/include/linux/swap.h index 2c3ce4c69b2..4f3838adbb3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -6,7 +6,6 @@ #include <linux/mmzone.h> #include <linux/list.h> #include <linux/sched.h> -#include <linux/pagemap.h> #include <asm/atomic.h> #include <asm/page.h> |