Skip to contentSkip to conversation

kill misleading comments in trampoline_*.S

PATCH Applied Pavel Machek 3 participants 4 messages Feb 1, 2008 x86

lore
Share & tools
lore
#0 lore raw

Both trampolines actually *do* set up stack. (Is the "we jump into compressed/head.S" comment still true?)

arch/x86/kernel/trampoline_32.S +0 -3
index 9bcc1c6..5398547 100644
@@ -11,9 +11,6 @@
  *	trampoline page to make our stack and everything else
  *	is a mystery.
  *
- *	In fact we don't actually need a stack so we don't
- *	set one up.
- *
  *	We jump into the boot/compressed/head.S code. So you'd
  *	better be running a compressed kernel image or you
  *	won't get very far.
arch/x86/kernel/trampoline_64.S +0 -3
index e30b67c..4aedd0b 100644
@@ -10,9 +10,6 @@
  *	trampoline page to make our stack and everything else
  *	is a mystery.
  *
- *	In fact we don't actually need a stack so we don't
- *	set one up.
- *
  *	On entry to trampoline_data, the processor is in real mode
  *	with 16-bit addressing and 16-bit data.  CS has some value
  *	and IP is zero.  Thus, data addresses need to be absolute
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw
Quoted 12 lines · Pavel Machek

Both trampolines actually *do* set up stack. (Is the "we jump into compressed/head.S" comment still true?)

arch/x86/kernel/trampoline_32.S +0 -0
index 9bcc1c6..5398547 100644

arch/x86/kernel/trampoline_32.S line 16

Quoted 9 lines
arch/x86/kernel/trampoline_32.S +0 -3
@@ -11,9 +11,6 @@
  *     trampoline page to make our stack and everything else
  *     is a mystery.
  *
- *     In fact we don't actually need a stack so we don't
- *     set one up.
- *
  *     We jump into the boot/compressed/head.S code. So you'd
  *     better be running a compressed kernel image or you
  *     won't get very far.

should be arch/x86/kernel/head_32.S

YH

#2 lore raw
Quoted 8 lines · Yinghai Lu
Quoted 7 lines · Pavel Machek

Both trampolines actually *do* set up stack. (Is the "we jump into compressed/head.S" comment still true?)

Quoted 16 lines
Quoted 5 lines
arch/x86/kernel/trampoline_32.S +0 -0
index 9bcc1c6..5398547 100644

arch/x86/kernel/trampoline_32.S line 16

Quoted 9 lines
arch/x86/kernel/trampoline_32.S +0 -3
@@ -11,9 +11,6 @@
  *     trampoline page to make our stack and everything else
  *     is a mystery.
  *
- *     In fact we don't actually need a stack so we don't
- *     set one up.
- *
  *     We jump into the boot/compressed/head.S code. So you'd
  *     better be running a compressed kernel image or you
  *     won't get very far.

should be arch/x86/kernel/head_32.S

Thanks, fixed in my local copy. But that's separate problem. ;-).

Pavel

arch/x86/kernel/trampoline_32.S +1 -6
index 9bcc1c6..6458067 100644
@@ -11,12 +11,7 @@
  *	trampoline page to make our stack and everything else
  *	is a mystery.
  *
- *	In fact we don't actually need a stack so we don't
- *	set one up.
- *
- *	We jump into the boot/compressed/head.S code. So you'd
- *	better be running a compressed kernel image or you
- *	won't get very far.
+ *	We jump into arch/x86/kernel/head_32.S.
  *
  *	On entry to trampoline_data, the processor is in real mode
  *	with 16-bit addressing and 16-bit data.  CS has some value
arch/x86/kernel/trampoline_64.S +0 -3
index e30b67c..4aedd0b 100644
@@ -10,9 +10,6 @@
  *	trampoline page to make our stack and everything else
  *	is a mystery.
  *
- *	In fact we don't actually need a stack so we don't
- *	set one up.
- *
  *	On entry to trampoline_data, the processor is in real mode
  *	with 16-bit addressing and 16-bit data.  CS has some value
  *	and IP is zero.  Thus, data addresses need to be absolute
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Applied
#3 lore raw
In reply to Pavel Machek
Quoted 2 lines · Pavel Machek

Both trampolines actually *do* set up stack. (Is the "we jump into compressed/head.S" comment still true?)

thanks, applied. (v2 of this patch)

Ingo