From 660e9c195f46cc557060c6dec230c895820aa03e Mon Sep 17 00:00:00 2001 From: okuji Date: Wed, 2 Feb 2005 20:40:06 +0000 Subject: [PATCH] 2005-02-02 Yoshinori K. Okuji * stage2/smp-imps.h (imps_any_new_apics): Removed. (imps_enabled): Likewise. (imps_lapic_addr): Likewise. (imps_num_cpus): Likewise. (imps_cpu_apic_map): Likewise. (imps_apic_cpu_map): Likewise. * stage2/Makefile.am (libgrub_a_CFLAGS): Remove -fwritable-strings. Not required for the grub shell actually. * grub/Makefile.am (AM_CFLAGS): Likewise. --- ChangeLog | 14 ++++++++++++++ grub/Makefile.am | 2 +- grub/Makefile.in | 2 +- stage2/Makefile.am | 3 +-- stage2/Makefile.in | 3 +-- stage2/smp-imps.c | 20 +++++++++++++++++++- stage2/smp-imps.h | 30 ------------------------------ 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07e4b00d9..6ad1038b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-02-02 Yoshinori K. Okuji + + * stage2/smp-imps.h (imps_any_new_apics): Removed. + (imps_enabled): Likewise. + (imps_lapic_addr): Likewise. + (imps_num_cpus): Likewise. + (imps_cpu_apic_map): Likewise. + (imps_apic_cpu_map): Likewise. + + * stage2/Makefile.am (libgrub_a_CFLAGS): Remove + -fwritable-strings. Not required for the grub shell actually. + + * grub/Makefile.am (AM_CFLAGS): Likewise. + 2005-02-01 Yoshinori K. Okuji * grub/asmstub.c (grub_stage2): Use auto instead of static for diff --git a/grub/Makefile.am b/grub/Makefile.am index 39a104885..7eb2eaadf 100644 --- a/grub/Makefile.am +++ b/grub/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ $(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \ -I$(top_srcdir)/stage1 -I$(top_srcdir)/lib -AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings +AM_CFLAGS = $(GRUB_CFLAGS) grub_SOURCES = main.c asmstub.c grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS) diff --git a/grub/Makefile.in b/grub/Makefile.in index 86a1651f4..67f1d4511 100644 --- a/grub/Makefile.in +++ b/grub/Makefile.in @@ -185,7 +185,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ $(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \ -I$(top_srcdir)/stage1 -I$(top_srcdir)/lib -AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings +AM_CFLAGS = $(GRUB_CFLAGS) grub_SOURCES = main.c asmstub.c grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS) all: all-am diff --git a/stage2/Makefile.am b/stage2/Makefile.am index 3a32ae750..f8e6d42b2 100644 --- a/stage2/Makefile.am +++ b/stage2/Makefile.am @@ -24,8 +24,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \ - -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \ - -fwritable-strings + -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 # Stage 2 and Stage 1.5's. pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) diff --git a/stage2/Makefile.in b/stage2/Makefile.in index ca28c17d3..7bfe3709a 100644 --- a/stage2/Makefile.in +++ b/stage2/Makefile.in @@ -579,8 +579,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \ - -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \ - -fwritable-strings + -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 @DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ @DISKLESS_SUPPORT_FALSE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ diff --git a/stage2/smp-imps.c b/stage2/smp-imps.c index 2fb6caeb9..a44d7867f 100644 --- a/stage2/smp-imps.c +++ b/stage2/smp-imps.c @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999 Free Software Foundation, Inc. + * Copyright (C) 1999,2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -249,13 +249,31 @@ defconfig = * Exported globals here. */ +/* + * "imps_any_new_apics" is non-zero if any of the APICS (local or I/O) + * are *not* an 82489DX. This is useful to determine if more than 15 + * CPUs can be supported (true if zero). + */ static int imps_any_new_apics = 0; #if 0 volatile int imps_release_cpus = 0; #endif +/* + * "imps_enabled" is non-zero if the probe sequence found IMPS + * information and was successful. + */ static int imps_enabled = 0; +/* + * This represents the number of CPUs found. + */ static int imps_num_cpus = 1; +/* + * This contains the local APIC hardware address. + */ static unsigned imps_lapic_addr = ((unsigned) (&lapic_dummy)) - LAPIC_ID; +/* + * These map from virtual cpu numbers to APIC id's and back. + */ static unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS]; static unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS]; diff --git a/stage2/smp-imps.h b/stage2/smp-imps.h index dc239942e..c0fdce346 100644 --- a/stage2/smp-imps.h +++ b/stage2/smp-imps.h @@ -182,36 +182,6 @@ struct imps_interrupt * Exported globals here. */ -/* - * "imps_any_new_apics" is non-zero if any of the APICS (local or I/O) - * are *not* an 82489DX. This is useful to determine if more than 15 - * CPUs can be supported (true if zero). - */ -extern int imps_any_new_apics; - -/* - * "imps_enabled" is non-zero if the probe sequence found IMPS - * information and was successful. - */ -extern int imps_enabled; - -/* - * This contains the local APIC hardware address. - */ -extern unsigned imps_lapic_addr; - -/* - * This represents the number of CPUs found. - */ -extern int imps_num_cpus; - -/* - * These map from virtual cpu numbers to APIC id's and back. - */ -extern unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS]; -extern unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS]; - - /* * This is the primary function for probing for Intel MPS 1.1/1.4 * compatible hardware and BIOS information. While probing the CPUs