dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Linus Torvalds 2012-04-23 19:50:48 -07:00
parent 4d634ca35a e00574b7f3
commit ce1ee9f5b9
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/hexagon/kernel/dma.c
View File

@ -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);

6
arch/hexagon/kernel/process.c
View File

@ -1,7 +1,7 @@
/* /*
* 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();
} }
} }

1
arch/hexagon/kernel/ptrace.c
View File

@ -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>

8
arch/hexagon/kernel/smp.c
View File

@ -1,7 +1,7 @@
/* /*
* 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();

1
arch/hexagon/kernel/time.c
View File

@ -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>

1
arch/hexagon/kernel/vdso.c
View File

@ -21,6 +21,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/binfmts.h>
#include <asm/vdso.h> #include <asm/vdso.h>