diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-31 16:05:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-31 16:05:48 -0500 |
commit | 62152d0ea7012382cd814c7b361b4ef2029f26e6 (patch) | |
tree | 2552f298c9c5c1f9be6d863d58ab5b4c0b24c37f | |
parent | 5aa0508508e7cd62bec6e3933b86fce03d2e8502 (diff) |
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 6ce9f3ab928d..75f2bfab614f 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/swap.h> | 16 | #include <linux/swap.h> |
17 | #include <linux/quicklist.h> | 17 | #include <linux/quicklist.h> |
18 | #include <asm/pgalloc.h> | ||
18 | #include <asm/tlbflush.h> | 19 | #include <asm/tlbflush.h> |
19 | 20 | ||
20 | /* | 21 | /* |
diff --git a/include/linux/swap.h b/include/linux/swap.h index 2c3ce4c69b25..4f3838adbb30 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <linux/mmzone.h> | 6 | #include <linux/mmzone.h> |
7 | #include <linux/list.h> | 7 | #include <linux/list.h> |
8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
9 | #include <linux/pagemap.h> | ||
10 | 9 | ||
11 | #include <asm/atomic.h> | 10 | #include <asm/atomic.h> |
12 | #include <asm/page.h> | 11 | #include <asm/page.h> |