diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-16 09:34:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-16 09:34:23 +0200 |
| commit | e3bbaa3cb6ac5a245e5ecc28b09f9b7b93b2dd8a (patch) | |
| tree | 04285bbf8d497caf6c2205dcf39e46873828cddc /arch/x86/kernel | |
| parent | 9c3254ad42e7925c3a3907a072185273705bd7b2 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | talos-op-linux-e3bbaa3cb6ac5a245e5ecc28b09f9b7b93b2dd8a.tar.gz talos-op-linux-e3bbaa3cb6ac5a245e5ecc28b09f9b7b93b2dd8a.zip | |
Merge commit 'v2.6.27-rc6' into x86/memory-corruption-check
Diffstat (limited to 'arch/x86/kernel')
| -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) if (!p) return -EINVAL; - if (!strcmp(p, "exactmap")) { + if (!strncmp(p, "exactmap", 8)) { #ifdef CONFIG_CRASH_DUMP /* * If we are doing a crash dump, we still need to know |
