* grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1'

rather than `/ 2', as the latter requires -Wa,--divide which would
require bumping our minimum binutils version.

diff --git a/ChangeLog b/ChangeLog
index 995799775d07d83f0169cbae4156cb3057107483..0c6e842deb718609d71bf4bf11eed4270899ce2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-04  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1'
+       rather than `/ 2', as the latter requires -Wa,--divide which would
+       require bumping our minimum binutils version.
+
 2010-12-03  BVK Chaitanya  <bvk.groups@gmail.com>
 
        * util/grub-script-check.c (main): Print script line number on

diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index d089a3e154424dd0eee4ee19109f544086c10075..7aebc8b3874c9220873c157e19b7faa3fba2fae4 100644 (file)
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -650,7 +650,7 @@ FUNCTION(grub_console_getkey)
        jae     2f
        movl    %edx, %eax
        leal    LOCAL(bypass_table), %edi
-       movl    $((LOCAL(bypass_table_end) - LOCAL(bypass_table)) / 2), %ecx
+       movl    $((LOCAL(bypass_table_end) - LOCAL(bypass_table)) >> 1), %ecx
        repne scasw 
        jz      3f