xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into cpus4096

Browse Source 
Conflicts:
	kernel/trace/ring_buffer.c
This commit is contained in:
Ingo Molnar
2008-12-02 20:09:50 +01:00
parent 1c39194878 061e41fdb5
commit a64d31baed
286 changed files with 5510 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/ptrace.h
View File

@@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
#define arch_has_block_step() (1)
extern void user_enable_block_step(struct task_struct *);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif /* !__KERNEL__ */
/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */