Fix call to replaced SuperIO functions
Matt Turner
maintainerPATCH 1/3 Fix call to replaced SuperIO functions
From: Morten H. Larsen <[email protected]>
This patch fixes the failure to compile Alpha Generic because of previously overlooked calls to ns87312_enable_ide(). The function has been replaced by newer SuperIO code.
---
This is a build fix for a regression introduced by 932e0c201d28a728e25d3b64. It therefore only applies to 2.6.35-stable.
arch/alpha/kernel/proto.h | 3 --- arch/alpha/kernel/sys_cabriolet.c | 19 ++++++++++++++++--- arch/alpha/kernel/sys_takara.c | 11 +++++++++-- 3 files changed, 25 insertions(+), 8 deletions(-)
arch/alpha/kernel/proto.h +0 -3
@@ -156,9 +156,6 @@ extern void SMC669_Init(int);/* es1888.c */ extern void es1888_init (void ); -/* ns87312.c */ -extern void ns87312_enable_ide (long ide_base); -/* ../lib/fpreg.c */ extern void alpha_write_fp_reg (unsigned long reg,unsigned long val);extern unsigned long alpha_read_fp_reg (unsigned long reg);
arch/alpha/kernel/sys_cabriolet.c +16 -3
@@ -33,7 +33,7 @@#include "irq_impl.h" #include "pci_impl.h" #include "machvec_impl.h" - +#include "pc873xx.h" /* Note mask bit is true for DISABLED irqs. */ static unsigned long cached_irq_mask = ~0UL ;
@@ -236,17 +236,30 @@ cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin) }static inline void __init +cabriolet_enable_ide (void ) +{ +if (pc873xx_probe () ==-1 ) { +printk (KERN_ERR "Probing for PC873xx Super IO chip failed.\n" ); + }else { +printk (KERN_INFO "Found %s Super IO chip at 0x%x\n" , +pc873xx_get_model (),pc873xx_get_base ()); + +pc873xx_enable_ide (); + } +} + +static inline void __init cabriolet_init_pci (void ) {common_init_pci (); -ns87312_enable_ide (0x398 ); +cabriolet_enable_ide (); }static inline void __init cia_cab_init_pci (void ) {cia_init_pci (); -ns87312_enable_ide (0x398 ); +cabriolet_enable_ide (); }/*
arch/alpha/kernel/sys_takara.c +9 -2
@@ -29,7 +29,7 @@#include "irq_impl.h" #include "pci_impl.h" #include "machvec_impl.h" - +#include "pc873xx.h" /* Note mask bit is true for DISABLED irqs. */ static unsigned long cached_irq_mask[2 ] = {-1 ,-1 };
@@ -264,7 +264,14 @@ takara_init_pci(void) alpha_mv.pci_map_irq = takara_map_irq_srm;cia_init_pci (); -ns87312_enable_ide (0x26e ); + +if (pc873xx_probe () ==-1 ) { +printk (KERN_ERR "Probing for PC873xx Super IO chip failed.\n" ); + }else { +printk (KERN_INFO "Found %s Super IO chip at 0x%x\n" , +pc873xx_get_model (),pc873xx_get_base ()); +pc873xx_enable_ide (); + } }
Signature · 1 line
1.7.1
Matt Turner
maintainerWhoops, please ignore the PATCH 1/3 title. This is the only patch going to -stable.
Quoted 6 lines · Matt Turner
From: Morten H. Larsen <[email protected]>
This patch fixes the failure to compile Alpha Generic because of previously overlooked calls to
ns87312_enable_ide(). The function has been replaced by newer SuperIO code.
Quoted 6 lines
Tested-by Michael Cree <[email protected]>Signed-off-by Morten H. Larsen <[email protected]>Signed-off-by Matt Turner <[email protected]>---
This is a build fix for a regression introduced by932e0c201d28a728e25d3b64. It therefore only applies to 2.6.35-stable.
Why isn't it also relevant to Linus's tree for .36 and beyond?
Or is this the same as 59b25ed91400ace98d6cf0d59b1cb6928ad5cd37 in Linus's tree? If so, please let me know that, it's important. I've gone and applied that commit, if that is incorrect, please let me know.
thanks,
greg k-h
Matt Turner
maintainerQuoted 16 lines · Greg KH
Quoted 6 lines · Matt Turner
From: Morten H. Larsen <[email protected]>
This patch fixes the failure to compile Alpha Generic because of previously overlooked calls to
ns87312_enable_ide(). The function has been replaced by newer SuperIO code.Quoted 6 lines
Tested-by Michael Cree <[email protected]>Signed-off-by Morten H. Larsen <[email protected]>Signed-off-by Matt Turner <[email protected]>---
This is a build fix for a regression introduced by932e0c201d28a728e25d3b64. It therefore only applies to 2.6.35-stable.Why isn't it also relevant to Linus's tree for .36 and beyond?
Quoted 8 lines
Or is this the same as
59b25ed91400ace98d6cf0d59b1cb6928ad5cd37in Linus's tree? If so, please let me know that, it's important. I've gone and applied that commit, if that is incorrect, please let me know.thanks,
greg k-h
Yes, it's the same as 59b25ed91400ace98d6cf0d59b1cb6 in Linus' tree.
Thanks Greg!
Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Greg,
In addition to the patch below could we also get:
3e073367a57d41e506f20aebb98e308387ce3090 alpha: Fix printk format errors
added to the 2.6.35 stable queue. It fixes a compile error when compiling a generic Alpha kernel without the legacy boot option.
Thanks
Michael.
Quoted 27 lines · Greg KH
Quoted 6 lines · Matt Turner
From: Morten H. Larsen <[email protected]>
This patch fixes the failure to compile Alpha Generic because of previously overlooked calls to
ns87312_enable_ide(). The function has been replaced by newer SuperIO code.Quoted 6 lines
Tested-by Michael Cree <[email protected]>Signed-off-by Morten H. Larsen <[email protected]>Signed-off-by Matt Turner <[email protected]>---
This is a build fix for a regression introduced by932e0c201d28a728e25d3b64. It therefore only applies to 2.6.35-stable.Why isn't it also relevant to Linus's tree for .36 and beyond?
Or is this the same as
59b25ed91400ace98d6cf0d59b1cb6928ad5cd37in Linus's tree? If so, please let me know that, it's important. I've gone and applied that commit, if that is incorrect, please let me know.thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Michael Cree
Greg,
In addition to the patch below could we also get:
3e073367a57d41e506f20aebb98e308387ce3090alpha: Fix printk format errorsadded to the 2.6.35 stable queue. It fixes a compile error when compiling a generic Alpha kernel without the legacy boot option.
Now applied, thanks.
greg k-h