diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 15:30:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 15:30:14 -0700 |
commit | c25d5180441e344a3368d100c57f0a481c6944f7 (patch) | |
tree | 1aa053650b49f987effcbc91184c9a4208d402b1 /arch/mips/sgi-ip27/ip27-klnuma.c | |
parent | 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 (diff) | |
parent | 9a244b95ddb62a17b62f4b061b6e13ca4d177942 (diff) | |
download | kernel_samsung_smdk4412-c25d5180441e344a3368d100c57f0a481c6944f7.zip kernel_samsung_smdk4412-c25d5180441e344a3368d100c57f0a481c6944f7.tar.gz kernel_samsung_smdk4412-c25d5180441e344a3368d100c57f0a481c6944f7.tar.bz2 |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Pass NULL not 0 for pointer value.
[MIPS] IP27: Make declaration of setup_replication_mask a proper prototype.
[MIPS] BigSur: More useful defconfig.
[MIPS] Cleanup definitions of speed_t and tcflag_t.
[MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c
[MIPS] Optimize and cleanup get_saved_sp, set_saved_sp
[MIPS] <asm/irq.h> does not need pt_regs anymore.
[MIPS] Workaround for bug in gcc -EB / -EL options.
[MIPS] Fix timer setup for Jazz
Diffstat (limited to 'arch/mips/sgi-ip27/ip27-klnuma.c')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-klnuma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c index d777b7d..f9f404a 100644 --- a/arch/mips/sgi-ip27/ip27-klnuma.c +++ b/arch/mips/sgi-ip27/ip27-klnuma.c @@ -26,7 +26,7 @@ static cpumask_t ktext_repmask; * kernel. For example, we should never put a copy on a headless node, * and we should respect the topology of the machine. */ -void __init setup_replication_mask() +void __init setup_replication_mask(void) { cnodeid_t cnode; |