Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 375943
b: refs/heads/master
c: bdc92d7
h: refs/heads/master
i:
  375941: 6a2b8a8
  375939: 6224679
  375935: 15dea30
v: v3
  • Loading branch information
Ralf Baechle committed May 21, 2013
1 parent 70b7323 commit 082831b
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d882f07a83642283b9bc4e7f4c56ac4982c5e629
refs/heads/master: bdc92d74e0ec95a8101447467c25f015105f2e5a
1 change: 1 addition & 0 deletions trunk/arch/mips/alchemy/board-gpr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/i2c.h>
#include <linux/i2c-gpio.h>
#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/reboot.h>
#include <asm/mach-au1x00/au1000.h>
#include <prom.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/alchemy/common/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>

#include <asm/idle.h>
#include <asm/processor.h>
#include <asm/time.h>
#include <asm/mach-au1x00/au1000.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/ath79/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <linux/clk.h>

#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/time.h> /* for mips_hpt_frequency */
#include <asm/reboot.h> /* for _machine_{restart,halt} */
#include <asm/mips_machine.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/cobalt/reset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/leds.h>

#include <asm/idle.h>
#include <asm/processor.h>

#include <cobalt.h>
Expand Down
11 changes: 11 additions & 0 deletions trunk/arch/mips/include/asm/idle.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef __ASM_IDLE_H
#define __ASM_IDLE_H

#include <linux/linkage.h>

extern void (*cpu_wait)(void);
extern asmlinkage void r4k_wait(void);
extern void r4k_wait_irqoff(void);
extern void __pastwait(void);

#endif /* __ASM_IDLE_H */
1 change: 0 additions & 1 deletion trunk/arch/mips/include/asm/processor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
/*
* System setup and hardware flags..
*/
extern void (*cpu_wait)(void);

extern unsigned int vced_count, vcei_count;

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/mips/kernel/idle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/sched.h>
#include <asm/cpu.h>
#include <asm/cpu-info.h>
#include <asm/idle.h>
#include <asm/mipsregs.h>

/*
Expand All @@ -44,8 +45,6 @@ static void r39xx_wait(void)
local_irq_enable();
}

extern void r4k_wait(void);

/*
* This variant is preferable as it allows testing need_resched and going to
* sleep depending on the outcome atomically. Unfortunately the "It is
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/kernel/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <asm/bootinfo.h>
#include <asm/cpu.h>
#include <asm/cpu-features.h>
#include <asm/idle.h>
#include <asm/mipsregs.h>
#include <asm/processor.h>
#include <asm/prom.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/kernel/smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <linux/atomic.h>
#include <asm/cpu.h>
#include <asm/processor.h>
#include <asm/idle.h>
#include <asm/r4k-timer.h>
#include <asm/mmu_context.h>
#include <asm/time.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/kernel/smtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <asm/hardirq.h>
#include <asm/hazards.h>
#include <asm/irq.h>
#include <asm/idle.h>
#include <asm/mmu_context.h>
#include <asm/mipsregs.h>
#include <asm/cacheflush.h>
Expand Down Expand Up @@ -858,7 +859,6 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)
unsigned long flags;
int mtflags;
unsigned long tcrestart;
extern void r4k_wait_irqoff(void), __pastwait(void);
int set_resched_flag = (type == LINUX_SMP_IPI &&
action == SMP_RESCHEDULE_YOURSELF);

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/kernel/traps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <asm/dsp.h>
#include <asm/fpu.h>
#include <asm/fpu_emulator.h>
#include <asm/idle.h>
#include <asm/mipsregs.h>
#include <asm/mipsmtregs.h>
#include <asm/module.h>
Expand All @@ -57,7 +58,6 @@
#include <asm/uasm.h>

extern void check_wait(void);
extern asmlinkage void r4k_wait(void);
extern asmlinkage void rollback_handle_int(void);
extern asmlinkage void handle_int(void);
extern u32 handle_tlbl[];
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/loongson/common/reset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/pm.h>

#include <asm/idle.h>
#include <asm/reboot.h>

#include <loongson.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/loongson1/common/reset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <linux/io.h>
#include <linux/pm.h>
#include <asm/idle.h>
#include <asm/reboot.h>

#include <loongson1.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/netlogic/xlp/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <linux/pm.h>
#include <linux/bootmem.h>

#include <asm/idle.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/bootinfo.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/netlogic/xlr/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <linux/serial_8250.h>
#include <linux/pm.h>

#include <asm/idle.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/bootinfo.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/pmcs-msp71xx/msp_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <asm/bootinfo.h>
#include <asm/cacheflush.h>
#include <asm/idle.h>
#include <asm/r4kcache.h>
#include <asm/reboot.h>
#include <asm/smp-ops.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/txx9/generic/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/time.h>
#include <asm/reboot.h>
#include <asm/r4kcache.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/vr41xx/common/pmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include <asm/cacheflush.h>
#include <asm/cpu.h>
#include <asm/idle.h>
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/reboot.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/mips/wrppmc/reset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/kernel.h>

#include <asm/cacheflush.h>
#include <asm/idle.h>
#include <asm/mipsregs.h>
#include <asm/processor.h>

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/cpufreq/loongson2_cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/platform_device.h>

#include <asm/clock.h>
#include <asm/idle.h>

#include <asm/mach-loongson/loongson.h>

Expand Down

0 comments on commit 082831b

Please sign in to comment.