diff options
| author | Andi Kleen <ak@suse.de> | 2005-11-05 11:25:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 22:55:13 -0500 |
| commit | fed644132f8ec4bf05b63f79c507c0acaa692c37 (patch) | |
| tree | 6b16c1bc5e63a755a5a952b0363bbcb30974370d | |
| parent | d1e3dfdc2c934a279bcfa19359e4daec02bda18f (diff) | |
[PATCH] x86_64: Make i386 compile again with fourth DMA32 zone
The code should deal with an additional empty zone, so fix up the
#error.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/srat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/srat.c b/arch/i386/kernel/srat.c index 8de658db8146..52b3ed5d2cb5 100644 --- a/arch/i386/kernel/srat.c +++ b/arch/i386/kernel/srat.c | |||
| @@ -137,8 +137,8 @@ static void __init parse_memory_affinity_structure (char *sratp) | |||
| 137 | "enabled and removable" : "enabled" ) ); | 137 | "enabled and removable" : "enabled" ) ); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | #if MAX_NR_ZONES != 3 | 140 | #if MAX_NR_ZONES != 4 |
| 141 | #error "MAX_NR_ZONES != 3, chunk_to_zone requires review" | 141 | #error "MAX_NR_ZONES != 4, chunk_to_zone requires review" |
| 142 | #endif | 142 | #endif |
| 143 | /* Take a chunk of pages from page frame cstart to cend and count the number | 143 | /* Take a chunk of pages from page frame cstart to cend and count the number |
| 144 | * of pages in each zone, returned via zones[]. | 144 | * of pages in each zone, returned via zones[]. |