Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1ee9f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel 

Pull Hexagon fixes from Richard Kuo:
 "It's mostly compile fixes and the Hexagon portion of a CPU hotplug
  patch set."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  hexagon: add missing cpu.h include
  hexagon/CPU hotplug: Add missing call to notify_cpu_starting()
  hexagon:  use renamed tick_nohz_idle_* functions
  Hexagon: misc compile warning/error cleanup due to missing headers
parents 4d634ca3 e00574b7

arch/hexagon/kernel/dma.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/genalloc.h>

#include <linux/genalloc.h>

#include <asm/dma-mapping.h>

#include <asm/dma-mapping.h>

#include <linux/module.h>





struct dma_map_ops *dma_ops;

struct dma_map_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);

EXPORT_SYMBOL(dma_ops);

arch/hexagon/kernel/process.c

+3 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * Process creation support for Hexagon

 * Process creation support for Hexagon

 *

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -88,7 +88,7 @@ void (*idle_sleep)(void) = default_idle; 
void cpu_idle(void)

void cpu_idle(void)

{

{

	while (1) {

	while (1) {

		tick_nohz_stop_sched_tick(1);

		tick_nohz_idle_enter();

		local_irq_disable();

		local_irq_disable();

		while (!need_resched()) {

		while (!need_resched()) {

			idle_sleep();

			idle_sleep();
@@ -97,7 +97,7 @@ void cpu_idle(void) 
			local_irq_disable();

			local_irq_disable();

		}

		}

		local_irq_enable();

		local_irq_enable();

		tick_nohz_restart_sched_tick();

		tick_nohz_idle_exit();

		schedule();

		schedule();

	}

	}

}

}

arch/hexagon/kernel/ptrace.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/ptrace.h>

#include <linux/ptrace.h>

#include <linux/regset.h>

#include <linux/regset.h>

#include <linux/user.h>

#include <linux/user.h>

#include <linux/elf.h>





#include <asm/user.h>

#include <asm/user.h>

arch/hexagon/kernel/smp.c

+7 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * SMP support for Hexagon

 * SMP support for Hexagon

 *

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -28,6 +28,7 @@ 
#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/smp.h>

#include <linux/smp.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/cpu.h>





#include <asm/time.h>    /*  timer_interrupt  */

#include <asm/time.h>    /*  timer_interrupt  */

#include <asm/hexagon_vm.h>

#include <asm/hexagon_vm.h>
@@ -177,7 +178,12 @@ void __cpuinit start_secondary(void) 




	printk(KERN_INFO "%s cpu %d\n", __func__, current_thread_info()->cpu);

	printk(KERN_INFO "%s cpu %d\n", __func__, current_thread_info()->cpu);





	notify_cpu_starting(cpu);



	ipi_call_lock();

	set_cpu_online(cpu, true);

	set_cpu_online(cpu, true);

	ipi_call_unlock();



	local_irq_enable();

	local_irq_enable();





	cpu_idle();

	cpu_idle();

arch/hexagon/kernel/time.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/module.h>





#include <asm/timer-regs.h>

#include <asm/timer-regs.h>

#include <asm/hexagon_vm.h>

#include <asm/hexagon_vm.h>