aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-30 21:57:01 -0500
committerPaul Mackerras <paulus@samba.org>2005-10-30 21:57:01 -0500
commit734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch)
tree507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc
parent23fd07750a789a66fe88cf173d52a18f1a387da4 (diff)
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/of_device.c2
-rw-r--r--arch/powerpc/kernel/ptrace.c2
-rw-r--r--arch/powerpc/kernel/ptrace32.c4
-rw-r--r--arch/powerpc/kernel/time.c4
-rw-r--r--arch/powerpc/lib/locks.c1
-rw-r--r--arch/powerpc/mm/imalloc.c5
6 files changed, 6 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 766718814515..7065e40e2f42 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -4,6 +4,8 @@
4#include <linux/init.h> 4#include <linux/init.h>
5#include <linux/module.h> 5#include <linux/module.h>
6#include <linux/mod_devicetable.h> 6#include <linux/mod_devicetable.h>
7#include <linux/slab.h>
8
7#include <asm/errno.h> 9#include <asm/errno.h>
8#include <asm/of_device.h> 10#include <asm/of_device.h>
9 11
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 943425a93354..568ea335d616 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -248,7 +248,7 @@ void ptrace_disable(struct task_struct *child)
248 clear_single_step(child); 248 clear_single_step(child);
249} 249}
250 250
251int sys_ptrace(long request, long pid, long addr, long data) 251long sys_ptrace(long request, long pid, long addr, long data)
252{ 252{
253 struct task_struct *child; 253 struct task_struct *child;
254 int ret = -EPERM; 254 int ret = -EPERM;
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 544368277d7e..91eb952e0293 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -40,8 +40,8 @@
40 * in exit.c or in signal.c. 40 * in exit.c or in signal.c.
41 */ 41 */
42 42
43int compat_sys_ptrace(int request, int pid, unsigned long addr, 43long compat_sys_ptrace(int request, int pid, unsigned long addr,
44 unsigned long data) 44 unsigned long data)
45{ 45{
46 struct task_struct *child; 46 struct task_struct *child;
47 int ret = -EPERM; 47 int ret = -EPERM;
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index ed5c38fb146c..23436b6c1881 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -70,10 +70,6 @@
70#include <asm/iSeries/HvCallXm.h> 70#include <asm/iSeries/HvCallXm.h>
71#endif 71#endif
72 72
73u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
74
75EXPORT_SYMBOL(jiffies_64);
76
77/* keep track of when we need to update the rtc */ 73/* keep track of when we need to update the rtc */
78time_t last_rtc_update; 74time_t last_rtc_update;
79extern int piranha_simulator; 75extern int piranha_simulator;
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 4b8c5ad5e7dc..3794715b2972 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -17,6 +17,7 @@
17#include <linux/spinlock.h> 17#include <linux/spinlock.h>
18#include <linux/module.h> 18#include <linux/module.h>
19#include <linux/stringify.h> 19#include <linux/stringify.h>
20#include <linux/smp.h>
20 21
21/* waiting for a spinlock... */ 22/* waiting for a spinlock... */
22#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) 23#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index c65b87b92756..f4ca29cf5364 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -300,12 +300,7 @@ void im_free(void * addr)
300 for (p = &imlist ; (tmp = *p) ; p = &tmp->next) { 300 for (p = &imlist ; (tmp = *p) ; p = &tmp->next) {
301 if (tmp->addr == addr) { 301 if (tmp->addr == addr) {
302 *p = tmp->next; 302 *p = tmp->next;
303
304 /* XXX: do we need the lock? */
305 spin_lock(&init_mm.page_table_lock);
306 unmap_vm_area(tmp); 303 unmap_vm_area(tmp);
307 spin_unlock(&init_mm.page_table_lock);
308
309 kfree(tmp); 304 kfree(tmp);
310 up(&imlist_sem); 305 up(&imlist_sem);
311 return; 306 return;