Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

powerpc: apply recent changes to merged code 



Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 23fd0775

arch/powerpc/kernel/of_device.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

arch/powerpc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/kernel/ptrace32.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 * in exit.c or in signal.c.

 */



int compat_sys_ptrace(int request, int pid, unsigned long addr,

long compat_sys_ptrace(int request, int pid, unsigned long addr,

		       unsigned long data)

{

	struct task_struct *child;

arch/powerpc/kernel/time.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/lib/locks.c

+1 −0
Original line number Diff line number Diff line
@@ -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)