Skip to content

L
linux
Commit ec26ea39 authored by David Mosberger's avatar David Mosberger
Browse files
Options

ia64: Small fixes for 2.6.0-test1 merge.

parent 3b840c19
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
arch/ia64/kernel/ptrace.c
View file @ ec26ea39
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
(IA64_PSR_UM | IA64_PSR_DB | IA64_PSR_IS | IA64_PSR_ID | IA64_PSR_DD | IA64_PSR_RI) (IA64_PSR_UM | IA64_PSR_DB | IA64_PSR_IS | IA64_PSR_ID | IA64_PSR_DD | IA64_PSR_RI)
#define IPSR_READ_MASK IPSR_WRITE_MASK #define IPSR_READ_MASK IPSR_WRITE_MASK
#define PTRACE_DEBUG 1 #define PTRACE_DEBUG 0
#if PTRACE_DEBUG #if PTRACE_DEBUG
# define dprintk(format...) printk(format) # define dprintk(format...) printk(format)
......
include/asm-ia64/elf.h
View file @ ec26ea39
...@@ -202,7 +202,7 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *); ...@@ -202,7 +202,7 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
#define ARCH_DLINFO \ #define ARCH_DLINFO \
do { \ do { \
extern char __kernel_syscall_via_epc[]; \ extern char __kernel_syscall_via_epc[]; \
NEW_AUX_ENT(AT_SYSINFO, __kernel_syscall_via_epc); \ NEW_AUX_ENT(AT_SYSINFO, (unsigned long) __kernel_syscall_via_epc); \
NEW_AUX_ENT(AT_SYSINFO_EHDR, (unsigned long) GATE_EHDR); \ NEW_AUX_ENT(AT_SYSINFO_EHDR, (unsigned long) GATE_EHDR); \
} while (0) } while (0)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7