Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c
This commit is contained in:
Jiri Kosina
@@ -16,7 +16,7 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/setup.h>
|
||||
|
||||
static char bug64hit[] __initdata =
|
||||
"reliable operation impossible!\n%s";
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/watch.h>
|
||||
#include <asm/elf.h>
|
||||
#include <asm/spram.h>
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
static inline void unmask_rm7k_irq(struct irq_data *d)
|
||||
{
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
static inline void unmask_rm9k_irq(struct irq_data *d)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <linux/ftrace.h>
|
||||
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <asm/irq_cpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/mipsmtregs.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
static inline void unmask_mips_irq(struct irq_data *d)
|
||||
{
|
||||
|
||||
@@ -326,7 +326,7 @@ static void sp_cleanup(void)
|
||||
i = j * __NFDBITS;
|
||||
if (i >= fdt->max_fds)
|
||||
break;
|
||||
set = fdt->open_fds->fds_bits[j++];
|
||||
set = fdt->open_fds[j++];
|
||||
while (set) {
|
||||
if (set & 1) {
|
||||
struct file * file = xchg(&fdt->fd[i], NULL);
|
||||
|
||||
@@ -173,7 +173,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
|
||||
if (retval)
|
||||
goto out_unlock;
|
||||
|
||||
cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
|
||||
cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask);
|
||||
|
||||
out_unlock:
|
||||
read_unlock(&tasklist_lock);
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/mipsmtregs.h>
|
||||
|
||||
@@ -606,6 +606,10 @@ static int mipspmu_event_init(struct perf_event *event)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
/* does not support taken branch sampling */
|
||||
if (has_branch_stack(event))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
switch (event->attr.type) {
|
||||
case PERF_TYPE_RAW:
|
||||
case PERF_TYPE_HARDWARE:
|
||||
|
||||
@@ -25,7 +25,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
if (!cpu_isset(n, cpu_online_map))
|
||||
if (!cpu_online(n))
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
#include <asm/dsp.h>
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/uaccess.h>
|
||||
@@ -80,9 +79,7 @@ void __noreturn cpu_idle(void)
|
||||
#endif
|
||||
rcu_idle_exit();
|
||||
tick_nohz_idle_exit();
|
||||
preempt_enable_no_resched();
|
||||
schedule();
|
||||
preempt_disable();
|
||||
schedule_preempt_disabled();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,20 +60,6 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* irq_create_of_mapping - Hook to resolve OF irq specifier into a Linux irq#
|
||||
*
|
||||
* Currently the mapping mechanism is trivial; simple flat hwirq numbers are
|
||||
* mapped 1:1 onto Linux irq numbers. Cascaded irq controllers are not
|
||||
* supported.
|
||||
*/
|
||||
unsigned int irq_create_of_mapping(struct device_node *controller,
|
||||
const u32 *intspec, unsigned int intsize)
|
||||
{
|
||||
return intspec[0];
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
|
||||
|
||||
void __init early_init_devtree(void *params)
|
||||
{
|
||||
/* Setup flat device-tree pointer */
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <asm/mipsmtregs.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/reg.h>
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
#include <asm/mipsmtregs.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/bootinfo.h>
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/vpe.h>
|
||||
#include <asm/rtlx.h>
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <asm/sections.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/smp-ops.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/prom.h>
|
||||
|
||||
struct cpuinfo_mips cpu_data[NR_CPUS] __read_mostly;
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <asm/cpu-features.h>
|
||||
#include <asm/war.h>
|
||||
#include <asm/vdso.h>
|
||||
#include <asm/dsp.h>
|
||||
|
||||
#include "signal-common.h"
|
||||
|
||||
|
||||
@@ -29,10 +29,10 @@
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/sim.h>
|
||||
#include <asm/ucontext.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/war.h>
|
||||
#include <asm/vdso.h>
|
||||
#include <asm/dsp.h>
|
||||
|
||||
#include "signal-common.h"
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <asm/sim.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/ucontext.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/cpu-features.h>
|
||||
#include <asm/war.h>
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
* SMP support for BMIPS
|
||||
*/
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/mm.h>
|
||||
@@ -29,7 +28,6 @@
|
||||
#include <asm/time.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/pmon.h>
|
||||
#include <asm/cacheflush.h>
|
||||
@@ -319,7 +317,7 @@ static int bmips_cpu_disable(void)
|
||||
|
||||
pr_info("SMP: CPU%d is offline\n", cpu);
|
||||
|
||||
cpu_clear(cpu, cpu_online_map);
|
||||
set_cpu_online(cpu, false);
|
||||
cpu_clear(cpu, cpu_callin_map);
|
||||
|
||||
local_flush_tlb_all();
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/time.h>
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/r4k-timer.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/setup.h>
|
||||
|
||||
#ifdef CONFIG_MIPS_MT_SMTC
|
||||
#include <asm/mipsmtregs.h>
|
||||
@@ -148,7 +148,7 @@ static void stop_this_cpu(void *dummy)
|
||||
/*
|
||||
* Remove this CPU:
|
||||
*/
|
||||
cpu_clear(smp_processor_id(), cpu_online_map);
|
||||
set_cpu_online(smp_processor_id(), false);
|
||||
for (;;) {
|
||||
if (cpu_wait)
|
||||
(*cpu_wait)(); /* Wait if available. */
|
||||
@@ -174,7 +174,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
|
||||
mp_ops->prepare_cpus(max_cpus);
|
||||
set_cpu_sibling_map(0);
|
||||
#ifndef CONFIG_HOTPLUG_CPU
|
||||
init_cpu_present(&cpu_possible_map);
|
||||
init_cpu_present(cpu_possible_mask);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
|
||||
while (!cpu_isset(cpu, cpu_callin_map))
|
||||
udelay(100);
|
||||
|
||||
cpu_set(cpu, cpu_online_map);
|
||||
set_cpu_online(cpu, true);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -320,13 +320,12 @@ void flush_tlb_mm(struct mm_struct *mm)
|
||||
if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
|
||||
smp_on_other_tlbs(flush_tlb_mm_ipi, mm);
|
||||
} else {
|
||||
cpumask_t mask = cpu_online_map;
|
||||
unsigned int cpu;
|
||||
|
||||
cpu_clear(smp_processor_id(), mask);
|
||||
for_each_cpu_mask(cpu, mask)
|
||||
if (cpu_context(cpu, mm))
|
||||
for_each_online_cpu(cpu) {
|
||||
if (cpu != smp_processor_id() && cpu_context(cpu, mm))
|
||||
cpu_context(cpu, mm) = 0;
|
||||
}
|
||||
}
|
||||
local_flush_tlb_mm(mm);
|
||||
|
||||
@@ -360,13 +359,12 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
|
||||
|
||||
smp_on_other_tlbs(flush_tlb_range_ipi, &fd);
|
||||
} else {
|
||||
cpumask_t mask = cpu_online_map;
|
||||
unsigned int cpu;
|
||||
|
||||
cpu_clear(smp_processor_id(), mask);
|
||||
for_each_cpu_mask(cpu, mask)
|
||||
if (cpu_context(cpu, mm))
|
||||
for_each_online_cpu(cpu) {
|
||||
if (cpu != smp_processor_id() && cpu_context(cpu, mm))
|
||||
cpu_context(cpu, mm) = 0;
|
||||
}
|
||||
}
|
||||
local_flush_tlb_range(vma, start, end);
|
||||
preempt_enable();
|
||||
@@ -407,13 +405,12 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
|
||||
|
||||
smp_on_other_tlbs(flush_tlb_page_ipi, &fd);
|
||||
} else {
|
||||
cpumask_t mask = cpu_online_map;
|
||||
unsigned int cpu;
|
||||
|
||||
cpu_clear(smp_processor_id(), mask);
|
||||
for_each_cpu_mask(cpu, mask)
|
||||
if (cpu_context(cpu, vma->vm_mm))
|
||||
for_each_online_cpu(cpu) {
|
||||
if (cpu != smp_processor_id() && cpu_context(cpu, vma->vm_mm))
|
||||
cpu_context(cpu, vma->vm_mm) = 0;
|
||||
}
|
||||
}
|
||||
local_flush_tlb_page(vma, page);
|
||||
preempt_enable();
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/mipsregs.h>
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/hazards.h>
|
||||
#include <asm/irq.h>
|
||||
@@ -292,7 +291,7 @@ static void smtc_configure_tlb(void)
|
||||
* possibly leave some TCs/VPEs as "slave" processors.
|
||||
*
|
||||
* Use c0_MVPConf0 to find out how many TCs are available, setting up
|
||||
* cpu_possible_map and the logical/physical mappings.
|
||||
* cpu_possible_mask and the logical/physical mappings.
|
||||
*/
|
||||
|
||||
int __init smtc_build_cpu_map(int start_cpu_slot)
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
#include <asm/fpu.h>
|
||||
#include <asm/mipsregs.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/r4kcache.h>
|
||||
#include <asm/hazards.h>
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <asm/shmparam.h>
|
||||
#include <asm/sysmips.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/switch_to.h>
|
||||
|
||||
/*
|
||||
* For historic reasons the pipe(2) syscall on MIPS has an unusual calling
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/sections.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/tlbdebug.h>
|
||||
#include <asm/traps.h>
|
||||
#include <asm/uaccess.h>
|
||||
@@ -1135,7 +1134,7 @@ asmlinkage void do_mt(struct pt_regs *regs)
|
||||
printk(KERN_DEBUG "YIELD Scheduler Exception\n");
|
||||
break;
|
||||
case 5:
|
||||
printk(KERN_DEBUG "Gating Storage Schedulier Exception\n");
|
||||
printk(KERN_DEBUG "Gating Storage Scheduler Exception\n");
|
||||
break;
|
||||
default:
|
||||
printk(KERN_DEBUG "*** UNKNOWN THREAD EXCEPTION %d ***\n",
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
#include <asm/cop2.h>
|
||||
#include <asm/inst.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#define STR(x) __STR(x)
|
||||
#define __STR(x) #x
|
||||
|
||||
@@ -88,8 +88,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
|
||||
|
||||
ret = install_special_mapping(mm, addr, PAGE_SIZE,
|
||||
VM_READ|VM_EXEC|
|
||||
VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
|
||||
VM_ALWAYSDUMP,
|
||||
VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
|
||||
&vdso_page);
|
||||
|
||||
if (ret)
|
||||
|
||||
@@ -69,7 +69,6 @@ SECTIONS
|
||||
RODATA
|
||||
|
||||
/* writeable */
|
||||
_sdata = .; /* Start of data section */
|
||||
.data : { /* Data */
|
||||
. = . + DATAOFFSET; /* for CONFIG_MAPPED_KERNEL */
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/mips_mt.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/vpe.h>
|
||||
#include <asm/kspd.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user