[PATCH] SAL version is not zero-padded

[PATCH] SAL version is not zero-padded

[Matthew Wilcox]

SAL is version 3.1, not 3.01.

diff -urpNX build-tools/dontdiff linus-2.6/arch/ia64/kernel/sal.c pciexp-2.6/arch/ia64/kernel/sal.c
--- linus-2.6/arch/ia64/kernel/sal.c	2003-07-29 13:00:27.000000000 -0400
+++ pciexp-2.6/arch/ia64/kernel/sal.c	2004-02-23 11:53:12.000000000 -0500
@@ -106,7 +106,7 @@ ia64_sal_init (struct ia64_sal_systab *s
 	/*
 	 * revisions are coded in BCD, so %x does the job for us
 	 */
-	printk(KERN_INFO "SAL v%x.%02x: oem=%.32s, product=%.32s\n",
+	printk(KERN_INFO "SAL v%x.%x: oem=%.32s, product=%.32s\n",
 	       systab->sal_rev_major, systab->sal_rev_minor,
 	       systab->oem_id, systab->product_id);
 

-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain

Re: [PATCH] SAL version is not zero-padded

[David Mosberger]

>>>>> On Mon, 23 Feb 2004 19:18:57 +0000, Matthew Wilcox <willy@debian.org> said:

  Matthew> SAL is version 3.1, not 3.01.

-	printk(KERN_INFO "SAL v%x.%02x: oem=%.32s, product=%.32s\n",
+	printk(KERN_INFO "SAL v%x.%x: oem=%.32s, product=%.32s\n",

Eh, it was printing a _byte_.  If you remove the byte-printing, I
suspect you'd also want to switch to a decimal format.

	--david

Re: [PATCH] SAL version is not zero-padded

[Matthew Wilcox]

On Mon, Feb 23, 2004 at 11:38:26AM -0800, David Mosberger wrote:
> >>>>> On Mon, 23 Feb 2004 19:18:57 +0000, Matthew Wilcox <willy@debian.org> said:
> 
>   Matthew> SAL is version 3.1, not 3.01.
> 
> -	printk(KERN_INFO "SAL v%x.%02x: oem=%.32s, product=%.32s\n",
> +	printk(KERN_INFO "SAL v%x.%x: oem=%.32s, product=%.32s\n",
> 
> Eh, it was printing a _byte_.  If you remove the byte-printing, I
> suspect you'd also want to switch to a decimal format.

No, it's still BCD encoded.  So it'll go from 0x09 to 0x10 when we move
from 3.9 to 3.10.  It just shouldn't be 0-padded.

-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain

Re: [PATCH] SAL version is not zero-padded

[David Mosberger]

>>>>> On Mon, 23 Feb 2004 19:46:02 +0000, Matthew Wilcox <willy@debian.org> said:

  >>  - printk(KERN_INFO "SAL v%x.%02x: oem=%.32s, product=%.32s\n", +
  >> printk(KERN_INFO "SAL v%x.%x: oem=%.32s, product=%.32s\n",

  >> Eh, it was printing a _byte_.  If you remove the byte-printing, I
  >> suspect you'd also want to switch to a decimal format.

  Matthew> No, it's still BCD encoded.  So it'll go from 0x09 to 0x10
  Matthew> when we move from 3.9 to 3.10.  It just shouldn't be
  Matthew> 0-padded.

Ah, that's OK then.

Thanks,

	--david