misc. patches for Altix

Here are a few more patches that haven't made their way into Linus' tree yet, but are necessary if you want to run 2.6 on Altix.

Thanks,
Jesse

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1402 -> 1.1403
# drivers/acpi/Kconfig 1.12 -> 1.13
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/07/30 [email protected] 1.1403

# acpi kconfig cleanup
# --------------------------------------------
#
diff -Nru a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig	Wed Jul 30 11:50:42 2003
+++ b/drivers/acpi/Kconfig	Wed Jul 30 11:50:42 2003
@@ -133,7 +133,7 @@

config ACPI_NUMA
bool "NUMA support" if NUMA && (IA64 && !IA64_HP_SIM || X86 && ACPI && !ACPI_HT_ONLY && !X86_64)
- default y if IA64 && IA64_SGI_SN
+ default y if IA64_GENERIC || IA64_SGI_SN2

config ACPI_ASUS
tristate "ASUS/Medion Laptop Extras"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1395 -> 1.1396
# drivers/acpi/tables.c 1.14 -> 1.15
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/07/30 [email protected] 1.1396
# don't use alloc_bootmem in acpi table init
# --------------------------------------------
#

diff -Nru a/drivers/acpi/tables.c b/drivers/acpi/tables.c
@@ -69,7 +69,8 @@
 
 static unsigned long		sdt_pa;		/* Physical Address */
 static unsigned long		sdt_count;	/* Table count */
-static struct acpi_table_sdt	*sdt_entry;
+
+static struct acpi_table_sdt	sdt_entry[ACPI_MAX_TABLES];
 
 void
 acpi_table_print (

@@ -413,12 +414,6 @@
 			sdt_count = ACPI_MAX_TABLES;
 		}
 
-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
-		if (!sdt_entry) {
-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
-			return -ENOMEM;
-		}
-
 		for (i = 0; i < sdt_count; i++)
 			sdt_entry[i].pa = (unsigned long) mapped_xsdt->entry[i];
 	}

@@ -463,12 +458,6 @@
 			printk(KERN_WARNING PREFIX "Truncated %lu RSDT entries\n",
 				(sdt_count - ACPI_MAX_TABLES));
 			sdt_count = ACPI_MAX_TABLES;
-		}
-
-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
-		if (!sdt_entry) {
-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
-			return -ENOMEM;
 		}
 
 		for (i = 0; i < sdt_count; i++)

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1617 -> 1.1618
# drivers/acpi/pci_irq.c 1.20 -> 1.21
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/04 [email protected] 1.1618

# acpi pci irq lookup fix
# --------------------------------------------
#
diff -Nru a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
--- a/drivers/acpi/pci_irq.c	Mon Aug  4 17:54:31 2003
+++ b/drivers/acpi/pci_irq.c	Mon Aug  4 17:54:31 2003
@@ -66,6 +66,9 @@

ACPI_FUNCTION_TRACE("acpi_pci_irq_find_prt_entry");

+ if (!acpi_prt.count)
+ return_PTR(NULL);
+
/*
* Parse through all PRT entries looking for a match on the specified
* PCI device's segment, bus, device, and pin (don't care about func).

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:

#	           ChangeSet	1.1614  -> 1.1615 
#	drivers/char/Kconfig	1.15    -> 1.16   
#	         MAINTAINERS	1.160   -> 1.161  

# drivers/char/Makefile 1.58 -> 1.59
# (new) -> 1.1 drivers/char/sn_serial.c
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/04 [email protected] 1.1615

# console-driver-2.6.0-test2-ia64-bk.patch
# --------------------------------------------
#
diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS	Mon Aug  4 17:44:16 2003
+++ b/MAINTAINERS	Mon Aug  4 17:44:16 2003
@@ -1653,6 +1653,12 @@
 W:	http://www.weinigel.se
 S:	Supported

+SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
+P: Chad Talbott
+M: [email protected]
+L: [email protected]
+S: Supported
+
SGI VISUAL WORKSTATION 320 AND 540
P: Andrey Panin
M: [email protected]

diff -Nru a/drivers/char/Kconfig b/drivers/char/Kconfig
@@ -393,6 +393,22 @@
 	  If you have an Alchemy AU1000 processor (MIPS based) and you want
 	  to use a console on a serial port, say Y.  Otherwise, say N.
 
+config SGI_L1_SERIAL
+	bool "SGI SN2 L1 serial port support"
+	depends on SERIAL_NONSTANDARD && IA64
+	help
+	  If you have an SGI SN2 and you want to use the serial port
+	  connected to the system controller (you want this!), say Y.
+	  Otherwise, say N.
+
+config SGI_L1_SERIAL_CONSOLE
+	bool "SGI SN2 L1 serial console support"
+	depends on SGI_L1_SERIAL
+	help
+	  If you have an SGI SN2 and you would like to use the system
+	  controller serial port as your console (you want this!), 
+	  say Y.  Otherwise, say N.
+
 config QTRONIX_KEYBOARD
 	bool "Enable Qtronix 990P Keyboard Support"
 	depends on IT8712

diff -Nru a/drivers/char/Makefile b/drivers/char/Makefile
@@ -41,6 +41,7 @@
 obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
 obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
 obj-$(CONFIG_RAW_DRIVER) += raw.o
+obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o
 
 obj-$(CONFIG_PRINTER) += lp.o
 obj-$(CONFIG_TIPAR) += tipar.o

===== fs/xfs/linux/xfs_aops.c 1.43 vs edited =====

@@ -803,7 +803,7 @@
 		bh = bh->b_this_page;
 	} while (offset < end_offset);
 
-	if (uptodate)
+	if (uptodate && bh == head)
 		SetPageUptodate(page);
 
 	if (startio)