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.

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

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

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

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