Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3e5e1a1 authored Jun 28, 2006 by Aaron Young Committed by Tony Luck Jun 28, 2006

[IA64-SGI] fix prom revision checks in SN kernel



The following patch fixes two spots in the SN kernel
that check a fixed prom revision number to determine prom
feature support. These checks are only valid on shub1 systems.
They are invalid on shub2 systems which have a different prom
with different revision numbers.

Signed-off-by: Aaron Young <ayoung@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

parent 59e2e689

arch/ia64/sn/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ void __init sn_setup(char **cmdline_p)
		* support here so we don't have to listen to failed keyboard probe
		* messages.
		*/
		if (version <= 0x0209 && acpi_kbd_controller_present) {
		if (is_shub1() && version <= 0x0209 && acpi_kbd_controller_present) {
		printk(KERN_INFO "Disabling legacy keyboard support as prom "
		"is too old and doesn't provide FADT\n");
		acpi_kbd_controller_present = 0;

arch/ia64/sn/pci/tioca_provider.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ tioca_bus_fixup(struct pcibus_bussoft prom_bussoft, struct pci_controller cont

		/* sanity check prom rev */

		if (sn_sal_rev() < 0x0406) {
		if (is_shub1() && sn_sal_rev() < 0x0406) {
		printk
		(KERN_ERR "%s: SGI prom rev 4.06 or greater required "
		"for tioca support\n", __FUNCTION__);