[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1827] 2008-08-22 Bean <address@hidden>
From: |
Bean |
Subject: |
[1827] 2008-08-22 Bean <address@hidden> |
Date: |
Sat, 23 Aug 2008 14:20:47 +0000 |
Revision: 1827
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1827
Author: bean
Date: 2008-08-23 14:20:45 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
2008-08-22 Bean <address@hidden>
* normal/x86_64/setjmp.S (grub_longjmp): Return 1 when val = 0.
* genfslist.sh: Ignore kernel.mod.
* genpartmaplist.sh: Likewise.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/genfslist.sh
trunk/grub2/genpartmaplist.sh
trunk/grub2/normal/x86_64/setjmp.S
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-08-23 12:19:43 UTC (rev 1826)
+++ trunk/grub2/ChangeLog 2008-08-23 14:20:45 UTC (rev 1827)
@@ -1,3 +1,11 @@
+2008-08-23 Bean <address@hidden>
+
+ * 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 <address@hidden>
* util/getroot.c (find_root_device): Skip anything that starts with
Modified: trunk/grub2/genfslist.sh
===================================================================
--- trunk/grub2/genfslist.sh 2008-08-23 12:19:43 UTC (rev 1826)
+++ trunk/grub2/genfslist.sh 2008-08-23 14:20:45 UTC (rev 1827)
@@ -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
Modified: trunk/grub2/genpartmaplist.sh
===================================================================
--- trunk/grub2/genpartmaplist.sh 2008-08-23 12:19:43 UTC (rev 1826)
+++ trunk/grub2/genpartmaplist.sh 2008-08-23 14:20:45 UTC (rev 1827)
@@ -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
Modified: trunk/grub2/normal/x86_64/setjmp.S
===================================================================
--- trunk/grub2/normal/x86_64/setjmp.S 2008-08-23 12:19:43 UTC (rev 1826)
+++ trunk/grub2/normal/x86_64/setjmp.S 2008-08-23 14:20:45 UTC (rev 1827)
@@ -50,6 +50,11 @@
*/
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1827] 2008-08-22 Bean <address@hidden>,
Bean <=