diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/x86/kernel/e820.c | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 9af89078f7bb..66e48aa2dd1b 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -1203,7 +1203,7 @@ static int __init parse_memmap_opt(char *p) | |||
| 1203 | if (!p) | 1203 | if (!p) |
| 1204 | return -EINVAL; | 1204 | return -EINVAL; |
| 1205 | 1205 | ||
| 1206 | if (!strcmp(p, "exactmap")) { | 1206 | if (!strncmp(p, "exactmap", 8)) { |
| 1207 | #ifdef CONFIG_CRASH_DUMP | 1207 | #ifdef CONFIG_CRASH_DUMP |
| 1208 | /* | 1208 | /* |
| 1209 | * If we are doing a crash dump, we still need to know | 1209 | * If we are doing a crash dump, we still need to know |