[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1791] 2008-08-07 Bean <address@hidden>
From: |
Bean |
Subject: |
[1791] 2008-08-07 Bean <address@hidden> |
Date: |
Thu, 07 Aug 2008 19:21:26 +0000 |
Revision: 1791
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1791
Author: bean
Date: 2008-08-07 19:21:25 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
2008-08-07 Bean <address@hidden>
* conf/x86_64-efi.rmk (kernel_mod_SOURCES): Add kern/time.c,
kern/i386/tsc.c and kern/i386/pit.c.
* include/grub/i386/tsc.h (grub_cpu_is_cpuid_supported): Handle
x86_64 platform.
* kern/i386/efi/init.c: Replace <grub/cpu/tsc.h> with
<grub/i386/tsc.h>.
* kern/i386/pit.c: Replace <grub/cpu/io.h> with <grub/i386/io.h>.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/x86_64-efi.mk
trunk/grub2/conf/x86_64-efi.rmk
trunk/grub2/include/grub/i386/tsc.h
trunk/grub2/kern/i386/efi/init.c
trunk/grub2/kern/i386/pit.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/ChangeLog 2008-08-07 19:21:25 UTC (rev 1791)
@@ -1,5 +1,18 @@
2008-08-07 Bean <address@hidden>
+ * conf/x86_64-efi.rmk (kernel_mod_SOURCES): Add kern/time.c,
+ kern/i386/tsc.c and kern/i386/pit.c.
+
+ * include/grub/i386/tsc.h (grub_cpu_is_cpuid_supported): Handle
+ x86_64 platform.
+
+ * kern/i386/efi/init.c: Replace <grub/cpu/tsc.h> with
+ <grub/i386/tsc.h>.
+
+ * kern/i386/pit.c: Replace <grub/cpu/io.h> with <grub/i386/io.h>.
+
+2008-08-07 Bean <address@hidden>
+
* conf/i386-efi.rmk (kernel_mod_SOURCES): Add kern/time.c.
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Add kern/time.c,
Modified: trunk/grub2/conf/x86_64-efi.mk
===================================================================
--- trunk/grub2/conf/x86_64-efi.mk 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/conf/x86_64-efi.mk 2008-08-07 19:21:25 UTC (rev 1791)
@@ -112,14 +112,16 @@
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
kern/x86_64/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
+ kern/time.c \
+ kern/i386/tsc.c kern/i386/pit.c \
kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c \
term/efi/console.c disk/efi/efidisk.c
-CLEANFILES += kernel.mod mod-kernel.o mod-kernel.c pre-kernel.o
kernel_mod-kern_x86_64_efi_startup.o kernel_mod-kern_x86_64_efi_callwrap.o
kernel_mod-kern_main.o kernel_mod-kern_device.o kernel_mod-kern_disk.o
kernel_mod-kern_dl.o kernel_mod-kern_file.o kernel_mod-kern_fs.o
kernel_mod-kern_err.o kernel_mod-kern_misc.o kernel_mod-kern_mm.o
kernel_mod-kern_loader.o kernel_mod-kern_rescue.o kernel_mod-kern_term.o
kernel_mod-kern_x86_64_dl.o kernel_mod-kern_i386_efi_init.o
kernel_mod-kern_parser.o kernel_mod-kern_partition.o kernel_mod-kern_env.o
kernel_mod-symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o
kernel_mod-kern_efi_mm.o kernel_mod-kern_generic_millisleep.o
kernel_mod-kern_generic_rtc_get_time_ms.o kernel_mod-term_efi_console.o
kernel_mod-disk_efi_efidisk.o und-kernel.lst
+CLEANFILES += kernel.mod mod-kernel.o mod-kernel.c pre-kernel.o
kernel_mod-kern_x86_64_efi_startup.o kernel_mod-kern_x86_64_efi_callwrap.o
kernel_mod-kern_main.o kernel_mod-kern_device.o kernel_mod-kern_disk.o
kernel_mod-kern_dl.o kernel_mod-kern_file.o kernel_mod-kern_fs.o
kernel_mod-kern_err.o kernel_mod-kern_misc.o kernel_mod-kern_mm.o
kernel_mod-kern_loader.o kernel_mod-kern_rescue.o kernel_mod-kern_term.o
kernel_mod-kern_x86_64_dl.o kernel_mod-kern_i386_efi_init.o
kernel_mod-kern_parser.o kernel_mod-kern_partition.o kernel_mod-kern_env.o
kernel_mod-symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o
kernel_mod-kern_efi_mm.o kernel_mod-kern_time.o kernel_mod-kern_i386_tsc.o
kernel_mod-kern_i386_pit.o kernel_mod-kern_generic_millisleep.o
kernel_mod-kern_generic_rtc_get_time_ms.o kernel_mod-term_efi_console.o
kernel_mod-disk_efi_efidisk.o und-kernel.lst
ifneq ($(kernel_mod_EXPORTS),no)
CLEANFILES += def-kernel.lst
DEFSYMFILES += def-kernel.lst
endif
-MOSTLYCLEANFILES += kernel_mod-kern_x86_64_efi_startup.d
kernel_mod-kern_x86_64_efi_callwrap.d kernel_mod-kern_main.d
kernel_mod-kern_device.d kernel_mod-kern_disk.d kernel_mod-kern_dl.d
kernel_mod-kern_file.d kernel_mod-kern_fs.d kernel_mod-kern_err.d
kernel_mod-kern_misc.d kernel_mod-kern_mm.d kernel_mod-kern_loader.d
kernel_mod-kern_rescue.d kernel_mod-kern_term.d kernel_mod-kern_x86_64_dl.d
kernel_mod-kern_i386_efi_init.d kernel_mod-kern_parser.d
kernel_mod-kern_partition.d kernel_mod-kern_env.d kernel_mod-symlist.d
kernel_mod-kern_efi_efi.d kernel_mod-kern_efi_init.d kernel_mod-kern_efi_mm.d
kernel_mod-kern_generic_millisleep.d kernel_mod-kern_generic_rtc_get_time_ms.d
kernel_mod-term_efi_console.d kernel_mod-disk_efi_efidisk.d
+MOSTLYCLEANFILES += kernel_mod-kern_x86_64_efi_startup.d
kernel_mod-kern_x86_64_efi_callwrap.d kernel_mod-kern_main.d
kernel_mod-kern_device.d kernel_mod-kern_disk.d kernel_mod-kern_dl.d
kernel_mod-kern_file.d kernel_mod-kern_fs.d kernel_mod-kern_err.d
kernel_mod-kern_misc.d kernel_mod-kern_mm.d kernel_mod-kern_loader.d
kernel_mod-kern_rescue.d kernel_mod-kern_term.d kernel_mod-kern_x86_64_dl.d
kernel_mod-kern_i386_efi_init.d kernel_mod-kern_parser.d
kernel_mod-kern_partition.d kernel_mod-kern_env.d kernel_mod-symlist.d
kernel_mod-kern_efi_efi.d kernel_mod-kern_efi_init.d kernel_mod-kern_efi_mm.d
kernel_mod-kern_time.d kernel_mod-kern_i386_tsc.d kernel_mod-kern_i386_pit.d
kernel_mod-kern_generic_millisleep.d kernel_mod-kern_generic_rtc_get_time_ms.d
kernel_mod-term_efi_console.d kernel_mod-disk_efi_efidisk.d
UNDSYMFILES += und-kernel.lst
kernel.mod: pre-kernel.o mod-kernel.o $(TARGET_OBJ2ELF)
@@ -128,9 +130,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-kernel.o: $(kernel_mod_DEPENDENCIES) kernel_mod-kern_x86_64_efi_startup.o
kernel_mod-kern_x86_64_efi_callwrap.o kernel_mod-kern_main.o
kernel_mod-kern_device.o kernel_mod-kern_disk.o kernel_mod-kern_dl.o
kernel_mod-kern_file.o kernel_mod-kern_fs.o kernel_mod-kern_err.o
kernel_mod-kern_misc.o kernel_mod-kern_mm.o kernel_mod-kern_loader.o
kernel_mod-kern_rescue.o kernel_mod-kern_term.o kernel_mod-kern_x86_64_dl.o
kernel_mod-kern_i386_efi_init.o kernel_mod-kern_parser.o
kernel_mod-kern_partition.o kernel_mod-kern_env.o kernel_mod-symlist.o
kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o kernel_mod-kern_efi_mm.o
kernel_mod-kern_generic_millisleep.o kernel_mod-kern_generic_rtc_get_time_ms.o
kernel_mod-term_efi_console.o kernel_mod-disk_efi_efidisk.o
+pre-kernel.o: $(kernel_mod_DEPENDENCIES) kernel_mod-kern_x86_64_efi_startup.o
kernel_mod-kern_x86_64_efi_callwrap.o kernel_mod-kern_main.o
kernel_mod-kern_device.o kernel_mod-kern_disk.o kernel_mod-kern_dl.o
kernel_mod-kern_file.o kernel_mod-kern_fs.o kernel_mod-kern_err.o
kernel_mod-kern_misc.o kernel_mod-kern_mm.o kernel_mod-kern_loader.o
kernel_mod-kern_rescue.o kernel_mod-kern_term.o kernel_mod-kern_x86_64_dl.o
kernel_mod-kern_i386_efi_init.o kernel_mod-kern_parser.o
kernel_mod-kern_partition.o kernel_mod-kern_env.o kernel_mod-symlist.o
kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o kernel_mod-kern_efi_mm.o
kernel_mod-kern_time.o kernel_mod-kern_i386_tsc.o kernel_mod-kern_i386_pit.o
kernel_mod-kern_generic_millisleep.o kernel_mod-kern_generic_rtc_get_time_ms.o
kernel_mod-term_efi_console.o kernel_mod-disk_efi_efidisk.o
-rm -f $@
- $(TARGET_CC) $(kernel_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
kernel_mod-kern_x86_64_efi_startup.o kernel_mod-kern_x86_64_efi_callwrap.o
kernel_mod-kern_main.o kernel_mod-kern_device.o kernel_mod-kern_disk.o
kernel_mod-kern_dl.o kernel_mod-kern_file.o kernel_mod-kern_fs.o
kernel_mod-kern_err.o kernel_mod-kern_misc.o kernel_mod-kern_mm.o
kernel_mod-kern_loader.o kernel_mod-kern_rescue.o kernel_mod-kern_term.o
kernel_mod-kern_x86_64_dl.o kernel_mod-kern_i386_efi_init.o
kernel_mod-kern_parser.o kernel_mod-kern_partition.o kernel_mod-kern_env.o
kernel_mod-symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o
kernel_mod-kern_efi_mm.o kernel_mod-kern_generic_millisleep.o
kernel_mod-kern_generic_rtc_get_time_ms.o kernel_mod-term_efi_console.o
kernel_mod-disk_efi_efidisk.o
+ $(TARGET_CC) $(kernel_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
kernel_mod-kern_x86_64_efi_startup.o kernel_mod-kern_x86_64_efi_callwrap.o
kernel_mod-kern_main.o kernel_mod-kern_device.o kernel_mod-kern_disk.o
kernel_mod-kern_dl.o kernel_mod-kern_file.o kernel_mod-kern_fs.o
kernel_mod-kern_err.o kernel_mod-kern_misc.o kernel_mod-kern_mm.o
kernel_mod-kern_loader.o kernel_mod-kern_rescue.o kernel_mod-kern_term.o
kernel_mod-kern_x86_64_dl.o kernel_mod-kern_i386_efi_init.o
kernel_mod-kern_parser.o kernel_mod-kern_partition.o kernel_mod-kern_env.o
kernel_mod-symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o
kernel_mod-kern_efi_mm.o kernel_mod-kern_time.o kernel_mod-kern_i386_tsc.o
kernel_mod-kern_i386_pit.o kernel_mod-kern_generic_millisleep.o
kernel_mod-kern_generic_rtc_get_time_ms.o kernel_mod-term_efi_console.o
kernel_mod-disk_efi_efidisk.o
mod-kernel.o: mod-kernel.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS)
-c -o $@ $<
@@ -584,6 +586,63 @@
set -e; $(TARGET_CC) -Ikern/efi -I$(srcdir)/kern/efi
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh kernel > $@ || (rm -f $@; exit 1)
+kernel_mod-kern_time.o: kern/time.c $(kern/time.c_DEPENDENCIES)
+ $(TARGET_CC) -Ikern -I$(srcdir)/kern $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -MD -c -o $@ $<
+-include kernel_mod-kern_time.d
+
+CLEANFILES += cmd-kernel_mod-kern_time.lst fs-kernel_mod-kern_time.lst
partmap-kernel_mod-kern_time.lst
+COMMANDFILES += cmd-kernel_mod-kern_time.lst
+FSFILES += fs-kernel_mod-kern_time.lst
+PARTMAPFILES += partmap-kernel_mod-kern_time.lst
+
+cmd-kernel_mod-kern_time.lst: kern/time.c $(kern/time.c_DEPENDENCIES)
gencmdlist.sh
+ set -e; $(TARGET_CC) -Ikern -I$(srcdir)/kern
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh kernel > $@ || (rm -f $@; exit 1)
+
+fs-kernel_mod-kern_time.lst: kern/time.c $(kern/time.c_DEPENDENCIES)
genfslist.sh
+ set -e; $(TARGET_CC) -Ikern -I$(srcdir)/kern
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh kernel > $@ || (rm -f $@; exit 1)
+
+partmap-kernel_mod-kern_time.lst: kern/time.c $(kern/time.c_DEPENDENCIES)
genpartmaplist.sh
+ set -e; $(TARGET_CC) -Ikern -I$(srcdir)/kern
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh kernel > $@ || (rm -f $@; exit 1)
+
+
+kernel_mod-kern_i386_tsc.o: kern/i386/tsc.c $(kern/i386/tsc.c_DEPENDENCIES)
+ $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -MD -c -o $@ $<
+-include kernel_mod-kern_i386_tsc.d
+
+CLEANFILES += cmd-kernel_mod-kern_i386_tsc.lst fs-kernel_mod-kern_i386_tsc.lst
partmap-kernel_mod-kern_i386_tsc.lst
+COMMANDFILES += cmd-kernel_mod-kern_i386_tsc.lst
+FSFILES += fs-kernel_mod-kern_i386_tsc.lst
+PARTMAPFILES += partmap-kernel_mod-kern_i386_tsc.lst
+
+cmd-kernel_mod-kern_i386_tsc.lst: kern/i386/tsc.c
$(kern/i386/tsc.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh kernel > $@ || (rm -f $@; exit 1)
+
+fs-kernel_mod-kern_i386_tsc.lst: kern/i386/tsc.c
$(kern/i386/tsc.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh kernel > $@ || (rm -f $@; exit 1)
+
+partmap-kernel_mod-kern_i386_tsc.lst: kern/i386/tsc.c
$(kern/i386/tsc.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh kernel > $@ || (rm -f $@; exit 1)
+
+
+kernel_mod-kern_i386_pit.o: kern/i386/pit.c $(kern/i386/pit.c_DEPENDENCIES)
+ $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -MD -c -o $@ $<
+-include kernel_mod-kern_i386_pit.d
+
+CLEANFILES += cmd-kernel_mod-kern_i386_pit.lst fs-kernel_mod-kern_i386_pit.lst
partmap-kernel_mod-kern_i386_pit.lst
+COMMANDFILES += cmd-kernel_mod-kern_i386_pit.lst
+FSFILES += fs-kernel_mod-kern_i386_pit.lst
+PARTMAPFILES += partmap-kernel_mod-kern_i386_pit.lst
+
+cmd-kernel_mod-kern_i386_pit.lst: kern/i386/pit.c
$(kern/i386/pit.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh kernel > $@ || (rm -f $@; exit 1)
+
+fs-kernel_mod-kern_i386_pit.lst: kern/i386/pit.c
$(kern/i386/pit.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh kernel > $@ || (rm -f $@; exit 1)
+
+partmap-kernel_mod-kern_i386_pit.lst: kern/i386/pit.c
$(kern/i386/pit.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh kernel > $@ || (rm -f $@; exit 1)
+
+
kernel_mod-kern_generic_millisleep.o: kern/generic/millisleep.c
$(kern/generic/millisleep.c_DEPENDENCIES)
$(TARGET_CC) -Ikern/generic -I$(srcdir)/kern/generic $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -MD -c -o $@ $<
-include kernel_mod-kern_generic_millisleep.d
Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/conf/x86_64-efi.rmk 2008-08-07 19:21:25 UTC (rev 1791)
@@ -87,6 +87,8 @@
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
kern/x86_64/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
+ kern/time.c \
+ kern/i386/tsc.c kern/i386/pit.c \
kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c \
term/efi/console.c disk/efi/efidisk.c
kernel_mod_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h
\
Modified: trunk/grub2/include/grub/i386/tsc.h
===================================================================
--- trunk/grub2/include/grub/i386/tsc.h 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/include/grub/i386/tsc.h 2008-08-07 19:21:25 UTC (rev 1791)
@@ -38,9 +38,34 @@
return (((grub_uint64_t) hi) << 32) | lo;
}
+#ifdef __x86_64__
+
static __inline int
grub_cpu_is_cpuid_supported (void)
{
+ grub_uint64_t id_supported;
+
+ __asm__ ("pushfq\n\t"
+ "popq %%rax /* Get EFLAGS into EAX */\n\t"
+ "movq %%rax, %%rcx /* Save original flags in ECX */\n\t"
+ "xorq $0x200000, %%rax /* Flip ID bit in EFLAGS */\n\t"
+ "pushq %%rax /* Store modified EFLAGS on stack */\n\t"
+ "popfq /* Replace current EFLAGS */\n\t"
+ "pushfq /* Read back the EFLAGS */\n\t"
+ "popq %%rax /* Get EFLAGS into EAX */\n\t"
+ "xorq %%rcx, %%rax /* Check if flag could be modified */\n\t"
+ : "=a" (id_supported)
+ : /* No inputs. */
+ : /* Clobbered: */ "%rcx");
+
+ return id_supported != 0;
+}
+
+#else
+
+static __inline int
+grub_cpu_is_cpuid_supported (void)
+{
grub_uint32_t id_supported;
__asm__ ("pushfl\n\t"
@@ -59,6 +84,8 @@
return id_supported != 0;
}
+#endif
+
static __inline int
grub_cpu_is_tsc_supported (void)
{
Modified: trunk/grub2/kern/i386/efi/init.c
===================================================================
--- trunk/grub2/kern/i386/efi/init.c 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/kern/i386/efi/init.c 2008-08-07 19:21:25 UTC (rev 1791)
@@ -25,7 +25,7 @@
#include <grub/cache.h>
#include <grub/kernel.h>
#include <grub/efi/efi.h>
-#include <grub/cpu/tsc.h>
+#include <grub/i386/tsc.h>
void
grub_machine_init (void)
Modified: trunk/grub2/kern/i386/pit.c
===================================================================
--- trunk/grub2/kern/i386/pit.c 2008-08-07 14:34:19 UTC (rev 1790)
+++ trunk/grub2/kern/i386/pit.c 2008-08-07 19:21:25 UTC (rev 1791)
@@ -17,7 +17,7 @@
*/
#include <grub/types.h>
-#include <grub/cpu/io.h>
+#include <grub/i386/io.h>
#include <grub/i386/pit.h>
#define TIMER2_REG_CONTROL 0x42
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1791] 2008-08-07 Bean <address@hidden>,
Bean <=