Commit 734d6524 authored by Paul Mackerras's avatar Paul Mackerras

powerpc: apply recent changes to merged code

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 23fd0775
......@@ -4,6 +4,8 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/slab.h>
#include <asm/errno.h>
#include <asm/of_device.h>
......
......@@ -248,7 +248,7 @@ void ptrace_disable(struct task_struct *child)
clear_single_step(child);
}
int sys_ptrace(long request, long pid, long addr, long data)
long sys_ptrace(long request, long pid, long addr, long data)
{
struct task_struct *child;
int ret = -EPERM;
......
......@@ -40,8 +40,8 @@
* in exit.c or in signal.c.
*/
int compat_sys_ptrace(int request, int pid, unsigned long addr,
unsigned long data)
long compat_sys_ptrace(int request, int pid, unsigned long addr,
unsigned long data)
{
struct task_struct *child;
int ret = -EPERM;
......
......@@ -70,10 +70,6 @@
#include <asm/iSeries/HvCallXm.h>
#endif
u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/* keep track of when we need to update the rtc */
time_t last_rtc_update;
extern int piranha_simulator;
......
......@@ -17,6 +17,7 @@
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/stringify.h>
#include <linux/smp.h>
/* waiting for a spinlock... */
#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
......
......@@ -300,12 +300,7 @@ void im_free(void * addr)
for (p = &imlist ; (tmp = *p) ; p = &tmp->next) {
if (tmp->addr == addr) {
*p = tmp->next;
/* XXX: do we need the lock? */
spin_lock(&init_mm.page_table_lock);
unmap_vm_area(tmp);
spin_unlock(&init_mm.page_table_lock);
kfree(tmp);
up(&imlist_sem);
return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment