From 82cc90ad020a17e49bb2fc6073bf09a014030393 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Fri, 18 Dec 2009 17:43:20 +0100 Subject: [PATCH] --- yaml --- r: 178002 b: refs/heads/master c: 622e99bf0d54c4517cb0524540cd77257db8621a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/ptrace.c | 2 +- trunk/include/linux/elf.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2274628df1af..092e7a559112 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b31001d306a2b5fd690eee878d2ee61a0a0674c +refs/heads/master: 622e99bf0d54c4517cb0524540cd77257db8621a diff --git a/trunk/arch/s390/kernel/ptrace.c b/trunk/arch/s390/kernel/ptrace.c index 653c6a178740..13815d39f7dd 100644 --- a/trunk/arch/s390/kernel/ptrace.c +++ b/trunk/arch/s390/kernel/ptrace.c @@ -959,7 +959,7 @@ static const struct user_regset s390_compat_regsets[] = { .set = s390_fpregs_set, }, [REGSET_GENERAL_EXTENDED] = { - .core_note_type = NT_PRXSTATUS, + .core_note_type = NT_S390_HIGH_GPRS, .n = sizeof(s390_compat_regs_high) / sizeof(compat_long_t), .size = sizeof(compat_long_t), .align = sizeof(compat_long_t), diff --git a/trunk/include/linux/elf.h b/trunk/include/linux/elf.h index 90a4ed0ea0e5..0cc4d55151b7 100644 --- a/trunk/include/linux/elf.h +++ b/trunk/include/linux/elf.h @@ -361,7 +361,7 @@ typedef struct elf64_shdr { #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ -#define NT_PRXSTATUS 0x300 /* s390 upper register halves */ +#define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */ /* Note header in a PT_NOTE section */