aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/cris/kernel/process.c3
-rw-r--r--arch/h8300/kernel/process.c4
-rw-r--r--arch/i386/kernel/apm.c2
-rw-r--r--arch/i386/mach-visws/reboot.c1
-rw-r--r--arch/ia64/kernel/setup.c1
-rw-r--r--arch/m68k/kernel/process.c2
-rw-r--r--arch/m68knommu/kernel/process.c2
-rw-r--r--arch/parisc/kernel/process.c5
-rw-r--r--arch/s390/kernel/process.c2
-rw-r--r--arch/sh/kernel/process.c1
-rw-r--r--arch/v850/kernel/process.c2
-rw-r--r--arch/x86_64/kernel/process.c2
-rw-r--r--include/asm-cris/system.h2
-rw-r--r--include/asm-i386/system.h2
-rw-r--r--include/asm-ia64/system.h2
-rw-r--r--include/linux/platform.h43
16 files changed, 14 insertions, 62 deletions
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 4ab3e87115b6..123451c44154 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -116,6 +116,7 @@
116#include <asm/pgtable.h> 116#include <asm/pgtable.h>
117#include <asm/uaccess.h> 117#include <asm/uaccess.h>
118#include <asm/irq.h> 118#include <asm/irq.h>
119#include <asm/system.h>
119#include <linux/module.h> 120#include <linux/module.h>
120#include <linux/spinlock.h> 121#include <linux/spinlock.h>
121#include <linux/fs_struct.h> 122#include <linux/fs_struct.h>
@@ -194,8 +195,6 @@ EXPORT_SYMBOL(enable_hlt);
194 */ 195 */
195void (*pm_idle)(void); 196void (*pm_idle)(void);
196 197
197extern void default_idle(void);
198
199/* 198/*
200 * The idle thread. There's no useful work to be 199 * The idle thread. There's no useful work to be
201 * done, so just try to conserve power and have a 200 * done, so just try to conserve power and have a
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index dd344f112cfe..16ccddc69c2b 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -54,7 +54,7 @@ asmlinkage void ret_from_fork(void);
54 * The idle loop on an H8/300.. 54 * The idle loop on an H8/300..
55 */ 55 */
56#if !defined(CONFIG_H8300H_SIM) && !defined(CONFIG_H8S_SIM) 56#if !defined(CONFIG_H8300H_SIM) && !defined(CONFIG_H8S_SIM)
57void default_idle(void) 57static void default_idle(void)
58{ 58{
59 local_irq_disable(); 59 local_irq_disable();
60 if (!need_resched()) { 60 if (!need_resched()) {
@@ -65,7 +65,7 @@ void default_idle(void)
65 local_irq_enable(); 65 local_irq_enable();
66} 66}
67#else 67#else
68void default_idle(void) 68static void default_idle(void)
69{ 69{
70 cpu_relax(); 70 cpu_relax();
71} 71}
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 05312a8abb8b..da30a374dd4e 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -824,8 +824,6 @@ static void apm_do_busy(void)
824 824
825static void (*original_pm_idle)(void); 825static void (*original_pm_idle)(void);
826 826
827extern void default_idle(void);
828
829/** 827/**
830 * apm_cpu_idle - cpu idling for APM capable Linux 828 * apm_cpu_idle - cpu idling for APM capable Linux
831 * 829 *
diff --git a/arch/i386/mach-visws/reboot.c b/arch/i386/mach-visws/reboot.c
index 5d73e042ed0a..99332abfad42 100644
--- a/arch/i386/mach-visws/reboot.c
+++ b/arch/i386/mach-visws/reboot.c
@@ -1,7 +1,6 @@
1#include <linux/module.h> 1#include <linux/module.h>
2#include <linux/smp.h> 2#include <linux/smp.h>
3#include <linux/delay.h> 3#include <linux/delay.h>
4#include <linux/platform.h>
5 4
6#include <asm/io.h> 5#include <asm/io.h>
7#include "piix4.h" 6#include "piix4.h"
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 3258e09278d0..958c1508036f 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -41,7 +41,6 @@
41#include <linux/serial_core.h> 41#include <linux/serial_core.h>
42#include <linux/efi.h> 42#include <linux/efi.h>
43#include <linux/initrd.h> 43#include <linux/initrd.h>
44#include <linux/platform.h>
45#include <linux/pm.h> 44#include <linux/pm.h>
46#include <linux/cpufreq.h> 45#include <linux/cpufreq.h>
47 46
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 2d8ad0727b6b..33648efb772e 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -77,7 +77,7 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
77/* 77/*
78 * The idle loop on an m68k.. 78 * The idle loop on an m68k..
79 */ 79 */
80void default_idle(void) 80static void default_idle(void)
81{ 81{
82 if (!need_resched()) 82 if (!need_resched())
83#if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES) 83#if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES)
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 63c117dae0c3..f861755ec88b 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(pm_power_off);
51/* 51/*
52 * The idle loop on an m68knommu.. 52 * The idle loop on an m68knommu..
53 */ 53 */
54void default_idle(void) 54static void default_idle(void)
55{ 55{
56 local_irq_disable(); 56 local_irq_disable();
57 while (!need_resched()) { 57 while (!need_resched()) {
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index e8dea4177113..0b485ef4be89 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -54,11 +54,6 @@
54#include <asm/uaccess.h> 54#include <asm/uaccess.h>
55#include <asm/unwind.h> 55#include <asm/unwind.h>
56 56
57void default_idle(void)
58{
59 barrier();
60}
61
62/* 57/*
63 * The idle thread. There's no useful work to be 58 * The idle thread. There's no useful work to be
64 * done, so just try to conserve power and have a 59 * done, so just try to conserve power and have a
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index da6fbae8df91..99182a415fe7 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -103,7 +103,7 @@ extern void s390_handle_mcck(void);
103/* 103/*
104 * The idle loop on a S390... 104 * The idle loop on a S390...
105 */ 105 */
106void default_idle(void) 106static void default_idle(void)
107{ 107{
108 int cpu, rc; 108 int cpu, rc;
109 109
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 9fd1723e6219..22dc9c21201d 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -19,7 +19,6 @@
19#include <linux/slab.h> 19#include <linux/slab.h>
20#include <linux/pm.h> 20#include <linux/pm.h>
21#include <linux/ptrace.h> 21#include <linux/ptrace.h>
22#include <linux/platform.h>
23#include <linux/kallsyms.h> 22#include <linux/kallsyms.h>
24#include <linux/kexec.h> 23#include <linux/kexec.h>
25 24
diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c
index 621111ddf907..57218c76925c 100644
--- a/arch/v850/kernel/process.c
+++ b/arch/v850/kernel/process.c
@@ -37,7 +37,7 @@ extern void ret_from_fork (void);
37 37
38 38
39/* The idle loop. */ 39/* The idle loop. */
40void default_idle (void) 40static void default_idle (void)
41{ 41{
42 while (! need_resched ()) 42 while (! need_resched ())
43 asm ("halt; nop; nop; nop; nop; nop" ::: "cc"); 43 asm ("halt; nop; nop; nop; nop; nop" ::: "cc");
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 22a05dec81a2..80a8f3079178 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -114,7 +114,7 @@ void exit_idle(void)
114 * We use this if we don't have any better 114 * We use this if we don't have any better
115 * idle routine.. 115 * idle routine..
116 */ 116 */
117void default_idle(void) 117static void default_idle(void)
118{ 118{
119 local_irq_enable(); 119 local_irq_enable();
120 120
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index d48670107a85..1d63c2aa8ec2 100644
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -71,4 +71,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
71 71
72#define arch_align_stack(x) (x) 72#define arch_align_stack(x) (x)
73 73
74void default_idle(void);
75
74#endif 76#endif
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index d0d8d7448d88..19cc79c9a35d 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -499,4 +499,6 @@ static inline void sched_cacheflush(void)
499extern unsigned long arch_align_stack(unsigned long sp); 499extern unsigned long arch_align_stack(unsigned long sp);
500extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 500extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
501 501
502void default_idle(void);
503
502#endif 504#endif
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index cd4233d66f15..2f3620593687 100644
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -265,6 +265,8 @@ void sched_cacheflush(void);
265 265
266#define arch_align_stack(x) (x) 266#define arch_align_stack(x) (x)
267 267
268void default_idle(void);
269
268#endif /* __KERNEL__ */ 270#endif /* __KERNEL__ */
269 271
270#endif /* __ASSEMBLY__ */ 272#endif /* __ASSEMBLY__ */
diff --git a/include/linux/platform.h b/include/linux/platform.h
deleted file mode 100644
index 3c33084a6ec2..000000000000
--- a/include/linux/platform.h
+++ /dev/null
@@ -1,43 +0,0 @@
1/*
2 * include/linux/platform.h - platform driver definitions
3 *
4 * Because of the prolific consumerism of the average American,
5 * and the dominant marketing budgets of PC OEMs, we have been
6 * blessed with frequent updates of the PC architecture.
7 *
8 * While most of these calls are singular per architecture, they
9 * require an extra layer of abstraction on the x86 so the right
10 * subsystem gets the right call.
11 *
12 * Basically, this consolidates the power off and reboot callbacks
13 * into one structure, as well as adding power management hooks.
14 *
15 * When adding a platform driver, please make sure all callbacks are
16 * filled. There are defaults defined below that do nothing; use those
17 * if you do not support that callback.
18 */
19
20#ifndef _PLATFORM_H_
21#define _PLATFORM_H_
22#ifdef __KERNEL__
23
24#include <linux/types.h>
25
26struct platform_t {
27 char * name;
28 u32 suspend_states;
29 void (*reboot)(char * cmd);
30 void (*halt)(void);
31 void (*power_off)(void);
32 int (*suspend)(int state, int flags);
33 void (*idle)(void);
34};
35
36extern struct platform_t * platform;
37extern void default_reboot(char * cmd);
38extern void default_halt(void);
39extern int default_suspend(int state, int flags);
40extern void default_idle(void);
41
42#endif /* __KERNEL__ */
43#endif /* _PLATFORM_H */