diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /kernel/kexec.c | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index ae1c35201cc8..f336e2107f98 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -1228,7 +1228,7 @@ static int __init parse_crashkernel_mem(char *cmdline, | |||
| 1228 | } while (*cur++ == ','); | 1228 | } while (*cur++ == ','); |
| 1229 | 1229 | ||
| 1230 | if (*crash_size > 0) { | 1230 | if (*crash_size > 0) { |
| 1231 | while (*cur != ' ' && *cur != '@') | 1231 | while (*cur && *cur != ' ' && *cur != '@') |
| 1232 | cur++; | 1232 | cur++; |
| 1233 | if (*cur == '@') { | 1233 | if (*cur == '@') { |
| 1234 | cur++; | 1234 | cur++; |