Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+13 -9
+7 -1
arch/openrisc/include/asm/ptrace.h
··· 77 77 long syscallno; /* Syscall number (used by strace) */ 78 78 long dummy; /* Cheap alignment fix */ 79 79 }; 80 - #endif /* __ASSEMBLY__ */ 81 80 82 81 /* TODO: Rename this to REDZONE because that's what it is */ 83 82 #define STACK_FRAME_OVERHEAD 128 /* size of minimum stack frame */ ··· 85 86 #define user_mode(regs) (((regs)->sr & SPR_SR_SM) == 0) 86 87 #define user_stack_pointer(regs) ((unsigned long)(regs)->sp) 87 88 #define profile_pc(regs) instruction_pointer(regs) 89 + 90 + static inline long regs_return_value(struct pt_regs *regs) 91 + { 92 + return regs->gpr[11]; 93 + } 94 + 95 + #endif /* __ASSEMBLY__ */ 88 96 89 97 /* 90 98 * Offsets used by 'ptrace' system call interface.
+1
arch/openrisc/kernel/init_task.c
··· 17 17 18 18 #include <linux/init_task.h> 19 19 #include <linux/mqueue.h> 20 + #include <linux/export.h> 20 21 21 22 static struct signal_struct init_signals = INIT_SIGNALS(init_signals); 22 23 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+1
arch/openrisc/kernel/irq.c
··· 23 23 #include <linux/irq.h> 24 24 #include <linux/seq_file.h> 25 25 #include <linux/kernel_stat.h> 26 + #include <linux/export.h> 26 27 27 28 #include <linux/irqflags.h> 28 29
+4 -8
arch/openrisc/kernel/ptrace.c
··· 188 188 */ 189 189 ret = -1L; 190 190 191 - /* Are these regs right??? */ 192 - if (unlikely(current->audit_context)) 193 - audit_syscall_entry(audit_arch(), regs->syscallno, 194 - regs->gpr[3], regs->gpr[4], 195 - regs->gpr[5], regs->gpr[6]); 191 + audit_syscall_entry(audit_arch(), regs->syscallno, 192 + regs->gpr[3], regs->gpr[4], 193 + regs->gpr[5], regs->gpr[6]); 196 194 197 195 return ret ? : regs->syscallno; 198 196 } ··· 199 201 { 200 202 int step; 201 203 202 - if (unlikely(current->audit_context)) 203 - audit_syscall_exit(AUDITSC_RESULT(regs->gpr[11]), 204 - regs->gpr[11]); 204 + audit_syscall_exit(regs); 205 205 206 206 step = test_thread_flag(TIF_SINGLESTEP); 207 207 if (step || test_thread_flag(TIF_SYSCALL_TRACE))