diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /arch/sparc/kernel/process.c | |
parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sparc/kernel/process.c')
-rw-r--r-- | arch/sparc/kernel/process.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 2c216ffeea90..29e72b57d4fd 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
@@ -158,8 +158,6 @@ void machine_halt(void) | |||
158 | panic("Halt failed!"); | 158 | panic("Halt failed!"); |
159 | } | 159 | } |
160 | 160 | ||
161 | EXPORT_SYMBOL(machine_halt); | ||
162 | |||
163 | void machine_restart(char * cmd) | 161 | void machine_restart(char * cmd) |
164 | { | 162 | { |
165 | char *p; | 163 | char *p; |
@@ -180,8 +178,6 @@ void machine_restart(char * cmd) | |||
180 | panic("Reboot failed!"); | 178 | panic("Reboot failed!"); |
181 | } | 179 | } |
182 | 180 | ||
183 | EXPORT_SYMBOL(machine_restart); | ||
184 | |||
185 | void machine_power_off(void) | 181 | void machine_power_off(void) |
186 | { | 182 | { |
187 | #ifdef CONFIG_SUN_AUXIO | 183 | #ifdef CONFIG_SUN_AUXIO |
@@ -191,8 +187,6 @@ void machine_power_off(void) | |||
191 | machine_halt(); | 187 | machine_halt(); |
192 | } | 188 | } |
193 | 189 | ||
194 | EXPORT_SYMBOL(machine_power_off); | ||
195 | |||
196 | static DEFINE_SPINLOCK(sparc_backtrace_lock); | 190 | static DEFINE_SPINLOCK(sparc_backtrace_lock); |
197 | 191 | ||
198 | void __show_backtrace(unsigned long fp) | 192 | void __show_backtrace(unsigned long fp) |