x86: constify data in reboot.c
PATCH 1/1 x86: constify data in reboot.c
Signed-off-by Jan Beulich <[email protected]>
--- arch/x86/kernel/reboot.c | 18 +++++++++--------- arch/x86/kernel/reboot_fixups_32.c | 4 ++-- include/asm-x86/reboot.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/kernel/reboot.c +9 -9
@@ -27,7 +27,7 @@void (*pm_power_off)(void );EXPORT_SYMBOL (pm_power_off); -static long no_idt[3 ]; +static const struct desc_ptr no_idt = {};static int reboot_mode;enum reboot_type reboot_type =BOOT_KBD ;int reboot_force;
@@ -202,15 +202,15 @@ core_initcall(reboot_init);controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ -static unsigned long long +static const unsigned long long real_mode_gdt_entries [3 ] = {0x0000000000000000ULL ,/* Null descriptor */ -0x00009a000000ffffULL ,/* 16-bit real-mode 64k code at 0x00000000 */ -0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ +0x00009b000000ffffULL ,/* 16-bit real-mode 64k code at 0x00000000 */ +0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ }; -static struct desc_ptr +static const struct desc_ptr real_mode_gdt = {sizeof (real_mode_gdt_entries) -1 , (long )real_mode_gdt_entries }, real_mode_idt = {0x3ff ,0 };
@@ -232,7 +232,7 @@ real_mode_idt = { 0x3ff, 0 };More could be done here to set up the registers as if a CPU reset had occurred; hopefully real BIOSs don't assume much. */ -static unsigned char real_mode_switch [] = +static const unsigned char real_mode_switch [] = {0x66 ,0x0f ,0x20 ,0xc0 ,/* movl %cr0,%eax */ 0x66 ,0x83 ,0xe0 ,0x11 ,/* andl $0x00000011,%eax */
@@ -246,7 +246,7 @@ static unsigned char real_mode_switch []0x24 ,0x10 ,/* f: andb $0x10,al */ 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ }; -static unsigned char jump_to_bios [] = +static const unsigned char jump_to_bios [] = {0xea ,0x00 ,0x00 ,0xff ,0xff /* ljmp $0xffff,$0x0000 */ };
@@ -256,7 +256,7 @@ static unsigned char jump_to_bios [] =* specified by the code and length parameters. * We assume that length will aways be less that 100! */ -void machine_real_restart (unsigned char *code,int length) +void machine_real_restart (const unsigned char *code,int length) {local_irq_disable ();
@@ -369,7 +369,7 @@ static void native_machine_emergency_res }case BOOT_TRIPLE : -load_idt ((const struct desc_ptr *)&no_idt); +load_idt (&no_idt); __asm__ __volatile__("int3" ); reboot_type =BOOT_KBD ;
arch/x86/kernel/reboot_fixups_32.c +2 -2
@@ -49,7 +49,7 @@ struct device_fixup {void (*reboot_fixup)(struct pci_dev *); }; -static struct device_fixup fixups_table[] = { +static const struct device_fixup fixups_table[] = { {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_LEGACY , cs5530a_warm_reset }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_CS5536_ISA , cs5536_warm_reset }, {PCI_VENDOR_ID_NS ,PCI_DEVICE_ID_NS_SC1100_BRIDGE , cs5530a_warm_reset },
@@ -64,7 +64,7 @@ static struct device_fixup fixups_table[*/ void mach_reboot_fixups (void ) { -struct device_fixup *cur; +const struct device_fixup *cur;struct pci_dev *dev;int i;
include/asm-x86/reboot.h +1 -1
@@ -15,6 +15,6 @@ struct machine_opsextern struct machine_ops machine_ops; -void machine_real_restart (unsigned char *code,int length); +void machine_real_restart (const unsigned char *code,int length);#endif /* _ASM_REBOOT_H */