From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Thibault Subject: Re: [PATCH] PV-GRUB: xfs support Date: Thu, 10 Jul 2008 14:15:29 +0100 Message-ID: <20080710131529.GV4536@implementation.uk.xensource.com> References: <20080710131331.GU4536@implementation.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20080710131331.GU4536@implementation.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Ooops, sorry, a real patch now :) PV-GRUB: xfs support i386 doesn't have PAE anyway. diff -r 562e77f7112f stubdom/grub.patches/99minios --- a/stubdom/grub.patches/99minios Thu Jul 10 12:15:55 2008 +0100 +++ b/stubdom/grub.patches/99minios Thu Jul 10 14:14:55 2008 +0100 @@ -1465,3 +1465,31 @@ # endif /* SUPPORT_DISKLESS */ static int preset_menu_offset; +Index: grub/stage2/fsys_xfs.c +=================================================================== +RCS file: /sources/grub/grub/stage2/fsys_xfs.c,v +retrieving revision 1.5 +diff -u -p -r1.5 fsys_xfs.c +--- grub/stage2/fsys_xfs.c 8 May 2005 02:18:14 -0000 1.5 ++++ grub/stage2/fsys_xfs.c 10 Jul 2008 13:09:50 -0000 +@@ -101,7 +101,7 @@ static inline __const__ xfs_uint16_t + le16 (xfs_uint16_t x) + { + __asm__("xchgb %b0,%h0" \ +- : "=q" (x) \ ++ : "=Q" (x) \ + : "0" (x)); \ + return x; + } +@@ -109,9 +109,9 @@ le16 (xfs_uint16_t x) + static inline __const__ xfs_uint32_t + le32 (xfs_uint32_t x) + { +-#if 0 ++#if 1 + /* 386 doesn't have bswap. */ +- __asm__("bswap %0" : "=r" (x) : "0" (x)); ++ __asm__("bswapl %k0" : "=r" (x) : "0" (x)); + #else + /* This is slower but this works on all x86 architectures. */ + __asm__("xchgb %b0, %h0" \