leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'core/urgent' into core/futexes

Browse Source 
Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
              to get the latest upstream fixes.

Conflicts:
	kernel/futex.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2009-05-20 09:02:28 +02:00
parent f1a11e0576 64d1304a64
commit 521c180874
4431 changed files with 492502 additions and 162339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/include/asm/atomic_32.h
View File

@@ -15,6 +15,8 @@
#ifdef __KERNEL__
#include <asm/system.h>
#define ATOMIC_INIT(i) { (i) }
extern int __atomic_add_return(int, atomic_t *);

2
arch/sparc/include/asm/mmzone.h
View File

@@ -3,6 +3,8 @@
#ifdef CONFIG_NEED_MULTIPLE_NODES
#include <linux/cpumask.h>
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])

5
arch/sparc/include/asm/parport.h
View File

@@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO,
op->dev.parent->parent);
op->dev.parent->parent, 0);
if (!p)
return -ENOMEM;
dev_set_drvdata(&op->dev, p);
@@ -168,7 +168,8 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0],
slot,
op->dev.parent);
op->dev.parent,
0);
err = -ENOMEM;
if (!p)
goto out_disable_irq;

4
arch/sparc/include/asm/unistd.h
View File

@@ -392,8 +392,10 @@
#define __NR_pipe2 321
#define __NR_inotify_init1 322
#define __NR_accept4 323
#define __NR_preadv 324
#define __NR_pwritev 325
#define NR_SYSCALLS 324
#define NR_SYSCALLS 326
#ifdef __32bit_syscall_numbers__
/* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,