diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
| commit | b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb (patch) | |
| tree | f190980d5bffae81a67c0cea0d913ed2444ceb0c /arch/i386/kernel/head.S | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
| parent | f5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel/head.S')
| -rw-r--r-- | arch/i386/kernel/head.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 5884469f6bfe..2bee6499edd9 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
| @@ -398,7 +398,11 @@ ignore_int: | |||
| 398 | pushl 32(%esp) | 398 | pushl 32(%esp) |
| 399 | pushl 40(%esp) | 399 | pushl 40(%esp) |
| 400 | pushl $int_msg | 400 | pushl $int_msg |
| 401 | #ifdef CONFIG_EARLY_PRINTK | ||
| 402 | call early_printk | ||
| 403 | #else | ||
| 401 | call printk | 404 | call printk |
| 405 | #endif | ||
| 402 | addl $(5*4),%esp | 406 | addl $(5*4),%esp |
| 403 | popl %ds | 407 | popl %ds |
| 404 | popl %es | 408 | popl %es |