x86: reboot_{32|64}.c unification

PATCH Applied Miguel Botón 2 participants 3 messages Jan 4, 2008 x86

lore

Share & tools

lore

Miguel Botón

author

2008-01-04 00:10 UTC #0 lore raw

PATCH 1/1 x86: reboot_{32|64}.c unification

reboot_{32|64}.c unification patch.

This patch unifies the code from the reboot_32.c and reboot_64.c files.

It has been tested in computers with X86_32 and X86_64 kernels and it looks like all reboot modes work fine (EFI restart system hasn't been tested yet).

Probably I made some mistakes (like I usually do) so I hope we can identify and fix them soon.

Signed-off-by Miguel Botón <[email protected]>

arch/x86/kernel/Makefile +2 -2

index 0903bbf..0cd4085 100644
@@ -30,8 +30,8 @@ obj-y				+= step.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
-obj-$(CONFIG_X86_64)            += reboot_64.o
+obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+obj-$(CONFIG_X86_64)		+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o

arch/x86/kernel/reboot.c new file +441 -0

441 lines not on this page · raw message

arch/x86/kernel/reboot_32.c deleted +0 ~~-413~~

413 lines not on this page · raw message

arch/x86/kernel/reboot_64.c deleted +0 ~~-191~~

191 lines not on this page · raw message

include/asm-x86/emergency-restart.h +3 -0

index 5418908..8e6aef1 100644
@@ -4,6 +4,9 @@
 enum reboot_type {
 	BOOT_TRIPLE = 't',
 	BOOT_KBD = 'k',
+#ifdef CONFIG_X86_32
+	BOOT_BIOS = 'b',
+#endif
 	BOOT_ACPI = 'a',
 	BOOT_EFI = 'e'
 };

Signature · 1 line

	Miguel Botón

Ingo Molnar

Applied

2008-01-04 13:06 UTC #1 lore raw

Quoted 8 lines · Miguel Botón

reboot_{32|64}.c unification patch.
This patch unifies the code from the reboot_32.c and reboot_64.c files.
It has been tested in computers with X86_32 and X86_64 kernels and it looks like all reboot modes work fine (EFI restart system hasn't been tested yet).

thanks, applied.

Quoted 2 lines

Probably I made some mistakes (like I usually do) so I hope we can identify and fix them soon.

well you sent it via Kmail, which is notorious for not wanting to send proper plain-text patches. Yours was:

Content-Type: text/plain;
charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

so i had to hand-apply it. There's a Kmail section in Documentation/email-clients.txt, please read it.

Ingo

Miguel Botón

author

2008-01-04 15:03 UTC #2 lore raw

Quoted 20 lines · On Friday 04 January 2008 14:03:31 Ingo Molnar wrote:

Quoted 8 lines · Miguel Botón
reboot_{32|64}.c unification patch.
This patch unifies the code from the reboot_32.c and reboot_64.c files.
It has been tested in computers with X86_32 and X86_64 kernels and it looks like all reboot modes work fine (EFI restart system hasn't been tested yet).
thanks, applied.
Quoted 2 lines
Probably I made some mistakes (like I usually do) so I hope we can identify and fix them soon.
well you sent it via Kmail, which is notorious for not wanting to send proper plain-text patches. Yours was:
 Content-Type: text/plain;
   charset="utf-8"

Quoted 7 lines

Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
so i had to hand-apply it. There's a Kmail section in Documentation/email-clients.txt, please read it.
Ingo

Yep, I used Kmail. Thanks for the warning.

Signature · 1 line

	Miguel Botón