From ce143fb1d335d8f846439b7d2d8b0adccdda276a Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Fri, 19 Oct 2007 21:42:24 -0700
Subject: [PATCH] --- yaml --- r: 71897 b: refs/heads/master c:
 0b463ff139d8f911f90c1d33a53aba094ed45907 h: refs/heads/master i:   71895:
 fac3b7b99e7a8a33173e338540a48fe0667e0664 v: v3

---
 [refs]                            |  2 +-
 trunk/MAINTAINERS                 | 13 ++++++-------
 trunk/Makefile                    |  2 +-
 trunk/drivers/sbus/char/vfc_dev.c |  2 +-
 trunk/mm/oom_kill.c               |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a0c372e8da8a..ccf8aa466fc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce59b460201c2281c2b6b3ead0b67ab21726268
+refs/heads/master: 0b463ff139d8f911f90c1d33a53aba094ed45907
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 1fd6d02a79b8..4ed41394e492 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1963,6 +1963,11 @@ M:	adaplas@gmail.com
 L:	linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:	Maintained
 
+INTEL APIC/IOAPIC, LOWLEVEL X86 SMP SUPPORT
+P:	Ingo Molnar
+M:	mingo@redhat.com
+S:	Maintained
+
 INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT
 P:	Jeff Garzik
 M:	jgarzik@pobox.com
@@ -4264,15 +4269,9 @@ M:	jacmet@sunsite.dk
 L:	linux-serial@vger.kernel.org
 S:	Maintained
 
-X86 ARCHITECTURE (32-BIT AND 64-BIT)
-P:	Thomas Gleixner
-M:	tglx@linutronix.de
+X86 3-LEVEL PAGING (PAE) SUPPORT
 P:	Ingo Molnar
 M:	mingo@redhat.com
-P:	H. Peter Anvin
-M:	hpa@zytor.com
-L:	linux-kernel@vger.kernel.org
-T:	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:	Maintained
 
 YAM DRIVER FOR AX.25
diff --git a/trunk/Makefile b/trunk/Makefile
index f9c264e243a2..50bb50defe18 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1505,7 +1505,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files))
 # and we build for the host arch
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = \
-	if [ -r System.map -a -x $(DEPMOD) -a "$(SUBARCH)" == "$(ARCH)" ]; then \
+	if [ -r System.map -a -x $(DEPMOD) -a "$(SUBARCH)" = "$(ARCH)" ]; then \
 		$(DEPMOD) -ae -F System.map                                     \
 		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) -r)   \
 		$(KERNELRELEASE);                                               \
diff --git a/trunk/drivers/sbus/char/vfc_dev.c b/trunk/drivers/sbus/char/vfc_dev.c
index d4f8fcded51d..e7a1642b2aa4 100644
--- a/trunk/drivers/sbus/char/vfc_dev.c
+++ b/trunk/drivers/sbus/char/vfc_dev.c
@@ -134,7 +134,7 @@ int init_vfc_hw(struct vfc_dev *dev)
 int init_vfc_devstruct(struct vfc_dev *dev, int instance) 
 {
 	dev->instance=instance;
-	mutex_init(&dev->device_lock_mtx);
+	init_MUTEX(&dev->device_lock_sem);
 	dev->control_reg=0;
 	dev->busy=0;
 	return 0;
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 91a081a82f55..824cade07827 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -496,7 +496,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
 			panic("Out of memory and no killable processes...\n");
 		}
 
-		if (oom_kill_process(p, gfp_mask, order, points,
+		if (oom_kill_process(p, points, gfp_mask, order,
 				     "Out of memory"))
 			goto retry;