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

Commit 88ebdda6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-3.3' of git://openrisc.net/jonas/linux 

Build fixes for 3.3 from Jonas Bonn

* tag 'for-3.3' of git://openrisc.net/jonas/linux:
  openrisc: Fix up audit_syscall_[entry|exit]() usage
  openrisc: include export.h for EXPORT_SYMBOL
parents 164974a8 3f6ffc8c

arch/openrisc/include/asm/ptrace.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,6 @@ struct pt_regs { 
	long  syscallno;	/* Syscall number (used by strace) */

	long  syscallno;	/* Syscall number (used by strace) */

	long dummy;		/* Cheap alignment fix */

	long dummy;		/* Cheap alignment fix */

};

};

#endif /* __ASSEMBLY__ */





/* TODO: Rename this to REDZONE because that's what it is */

/* TODO: Rename this to REDZONE because that's what it is */

#define STACK_FRAME_OVERHEAD  128  /* size of minimum stack frame */

#define STACK_FRAME_OVERHEAD  128  /* size of minimum stack frame */
@@ -87,6 +86,13 @@ struct pt_regs { 
#define user_stack_pointer(regs)	((unsigned long)(regs)->sp)

#define user_stack_pointer(regs)	((unsigned long)(regs)->sp)

#define profile_pc(regs)		instruction_pointer(regs)

#define profile_pc(regs)		instruction_pointer(regs)





static inline long regs_return_value(struct pt_regs *regs)

{

	return regs->gpr[11];

}



#endif /* __ASSEMBLY__ */



/*

/*

 * Offsets used by 'ptrace' system call interface.

 * Offsets used by 'ptrace' system call interface.

 */

 */

arch/openrisc/kernel/init_task.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 




#include <linux/init_task.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/mqueue.h>

#include <linux/export.h>





static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

arch/openrisc/kernel/irq.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/kernel_stat.h>

#include <linux/kernel_stat.h>

#include <linux/export.h>





#include <linux/irqflags.h>

#include <linux/irqflags.h>

arch/openrisc/kernel/ptrace.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -188,8 +188,6 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) 
		 */

		 */

		ret = -1L;

		ret = -1L;





	/* Are these regs right??? */

	if (unlikely(current->audit_context))

	audit_syscall_entry(audit_arch(), regs->syscallno,

	audit_syscall_entry(audit_arch(), regs->syscallno,

			    regs->gpr[3], regs->gpr[4],

			    regs->gpr[3], regs->gpr[4],

			    regs->gpr[5], regs->gpr[6]);

			    regs->gpr[5], regs->gpr[6]);
@@ -201,9 +199,7 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs) 
{

{

	int step;

	int step;





	if (unlikely(current->audit_context))

	audit_syscall_exit(regs);

		audit_syscall_exit(AUDITSC_RESULT(regs->gpr[11]),

				   regs->gpr[11]);





	step = test_thread_flag(TIF_SINGLESTEP);

	step = test_thread_flag(TIF_SINGLESTEP);

	if (step || test_thread_flag(TIF_SYSCALL_TRACE))

	if (step || test_thread_flag(TIF_SYSCALL_TRACE))