2008-08-22 Bean <bean123ch@gmail.com>

	* normal/x86_64/setjmp.S (grub_longjmp): Return 1 when val = 0.

	* genfslist.sh: Ignore kernel.mod.

	* genpartmaplist.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3b0ce520b580c5640627a98bdcd436a191d34e2b..e289ff83df38423e753f97b50830cae8d0a9aa98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-23  Bean  <bean123ch@gmail.com>
+
+       * normal/x86_64/setjmp.S (grub_longjmp): Return 1 when val = 0.
+
+       * genfslist.sh: Ignore kernel.mod.
+
+       * genpartmaplist.sh: Likewise.
+
 2008-08-23  Robert Millan  <rmh@aybabtu.com>
 
        * util/getroot.c (find_root_device): Skip anything that starts with

diff --git a/genfslist.sh b/genfslist.sh
index b54f0ff824d6a0fa90bdaa63fded29b2338055fb..ec48e86edff40a76d9118a0c89f0ca33bdda4d0e 100644 (file)
--- a/genfslist.sh
+++ b/genfslist.sh
@@ -15,6 +15,11 @@
 
 module=$1
 
+# Ignore kernel.mod.
+if test $module = kernel; then
+    exit
+fi
+
 # For now, this emits only a module name, if the module registers a filesystem.
 if grep -v "^#" | grep '^ *grub_fs_register' >/dev/null 2>&1; then
     echo $module

diff --git a/genpartmaplist.sh b/genpartmaplist.sh
index ba6504999b3e3dc3e7cd210ca12e4aea687db079..fceb0f869fb5bcccd802f0cf575cecd256c28b90 100644 (file)
--- a/genpartmaplist.sh
+++ b/genpartmaplist.sh
@@ -15,6 +15,11 @@
 
 module=$1
 
+# Ignore kernel.mod.
+if test $module = kernel; then
+    exit
+fi
+
 # For now, this emits only a module name, if the module registers a partition map.
 if grep -v "^#" | grep '^ *grub_partition_map_register' >/dev/null 2>&1; then
     echo $module

diff --git a/normal/x86_64/setjmp.S b/normal/x86_64/setjmp.S
index 4c8d4b3a5f16a521b6cf20a984dd8ce1f3b065a2..621b09b93ec818ab1171a79b06ea2cd3ab950a81 100644 (file)
--- a/normal/x86_64/setjmp.S
+++ b/normal/x86_64/setjmp.S
@@ -50,6 +50,11 @@ FUNCTION(grub_setjmp)
  */
 FUNCTION(grub_longjmp)
        movl    %esi, %eax
+       orl     %eax, %eax
+       jnz     1f
+       incl    %eax
+1:
+
        movq    (%rdi), %rbx
        movq    8(%rdi), %rsp
        movq    16(%rdi), %rbp