2007-11-05 Robert Millan <rmh@aybabtu.com>
* disk/ata.c: Remove `<grub/machine/time.h>'. Include `<grub/time.h>'. (grub_ata_wait): Reimplement using grub_millisleep(). * include/grub/misc.h (grub_div_roundup): Fix parenthesization. * include/grub/i386/time.h (grub_cpu_idle): Disable `hlt' instruction.
This commit is contained in:
parent
be7ac41e14
commit
0149ab7c63
5 changed files with 14 additions and 8 deletions
|
@ -22,7 +22,8 @@
|
|||
static __inline void
|
||||
grub_cpu_idle ()
|
||||
{
|
||||
__asm__ __volatile__ ("hlt");
|
||||
/* FIXME: this can't work untill we handle interrupts. */
|
||||
/* __asm__ __volatile__ ("hlt"); */
|
||||
}
|
||||
|
||||
#endif /* ! KERNEL_CPU_TIME_HEADER */
|
||||
|
|
|
@ -106,7 +106,7 @@ grub_max (long x, long y)
|
|||
static inline unsigned int
|
||||
grub_div_roundup (unsigned int x, unsigned int y)
|
||||
{
|
||||
return (x + (y - 1) / y);
|
||||
return (x + y - 1) / y;
|
||||
}
|
||||
|
||||
#endif /* ! GRUB_MISC_HEADER */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue