Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71900
b: refs/heads/master
c: 093faa1
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Oct 21, 2007
1 parent 5a05d08 commit d10e3e5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 437374e9a95062fe310b901e48585691edaf5dd0
refs/heads/master: 093faa1dd26fc6766f8f04c429030757a8a0def4
13 changes: 7 additions & 6 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/sbus/char/vfc_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/oom_kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, points, gfp_mask, order,
if (oom_kill_process(p, gfp_mask, order, points,
"Out of memory"))
goto retry;

Expand Down

0 comments on commit d10e3e5

Please sign in to comment.