diff options
| -rw-r--r-- | MAINTAINERS | 13 | ||||
| -rw-r--r-- | drivers/sbus/char/vfc_dev.c | 2 | ||||
| -rw-r--r-- | mm/oom_kill.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4ed41394e49..1fd6d02a79b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1963,11 +1963,6 @@ 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 @@ -4269,9 +4264,15 @@ M: jacmet@sunsite.dk L: linux-serial@vger.kernel.org S: Maintained -X86 3-LEVEL PAGING (PAE) SUPPORT +X86 ARCHITECTURE (32-BIT AND 64-BIT) +P: Thomas Gleixner +M: tglx@linutronix.de 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/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index e7a1642b2aa..d4f8fcded51 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/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; - init_MUTEX(&dev->device_lock_sem); + mutex_init(&dev->device_lock_mtx); dev->control_reg=0; dev->busy=0; return 0; diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 824cade0782..91a081a82f5 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -496,7 +496,7 @@ retry: panic("Out of memory and no killable processes...\n"); } - if (oom_kill_process(p, points, gfp_mask, order, + if (oom_kill_process(p, gfp_mask, order, points, "Out of memory")) goto retry; |