diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-27 03:00:35 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-27 03:00:35 (GMT) |
| commit | 8fe5f56c8a203a7a83d1b621c369655d914f3752 (patch) | |
| tree | ec865efb2d577d1e536720a28ae18b10bdbfd973 /arch/sparc/kernel | |
| parent | df2e7f525d88da992021b589d8a412afc15de36c (diff) | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 (diff) | |
| download | linux-fsl-qoriq-8fe5f56c8a203a7a83d1b621c369655d914f3752.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
arch/sparc/kernel/leon_smp.c
Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.
Resolve a small include line conflict in leon_smp.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/leon_smp.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c index 6173f4d..356dfc4 100644 --- a/arch/sparc/kernel/leon_smp.c +++ b/arch/sparc/kernel/leon_smp.c @@ -79,6 +79,8 @@ void __cpuinit leon_callin(void) local_flush_tlb_all(); leon_configure_cache_smp(); + notify_cpu_starting(cpuid); + /* Get our local ticker going. */ register_percpu_ce(cpuid); diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 232df99..3ee51f1 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -566,15 +566,10 @@ out: SYSCALL_DEFINE2(64_munmap, unsigned long, addr, size_t, len) { - long ret; - if (invalid_64bit_range(addr, len)) return -EINVAL; - down_write(¤t->mm->mmap_sem); - ret = do_munmap(current->mm, addr, len); - up_write(¤t->mm->mmap_sem); - return ret; + return vm_munmap(addr, len); } extern unsigned long do_mremap(unsigned long addr, |