The patch titled
-fstack-protector feature: annotate the PDA offsets
has been added to the -mm tree. Its filename is
fstack-protector-feature-annotate-the-pda-offsets.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: -fstack-protector feature: annotate the PDA offsets
From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Change the comments in the pda structure to make the first fields to have
their offset documented and to have the comments aligned.
The stack protector series needs a field at offset 40 (gcc ABI); annotate upto
40 for that reason.
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-x86_64/pda.h | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff -puN include/asm-x86_64/pda.h~fstack-protector-feature-annotate-the-pda-offsets include/asm-x86_64/pda.h
--- a/include/asm-x86_64/pda.h~fstack-protector-feature-annotate-the-pda-offsets
+++ a/include/asm-x86_64/pda.h
@@ -9,14 +9,12 @@
/* Per processor datastructure. %gs points to it while the kernel runs */
struct x8664_pda {
- struct task_struct *pcurrent; /* Current process */
- unsigned long data_offset; /* Per cpu data offset from linker address */
- unsigned long kernelstack; /* top of kernel stack for current */
- unsigned long oldrsp; /* user rsp for system call */
-#if DEBUG_STKSZ > EXCEPTION_STKSZ
- unsigned long debugstack; /* #DB/#BP stack. */
-#endif
- int irqcount; /* Irq nesting counter. Starts with -1 */
+ struct task_struct *pcurrent; /* 0 */ /* Current process */
+ unsigned long data_offset; /* 8 */ /* Per cpu data offset from linker address */
+ unsigned long kernelstack; /* 16 */ /* top of kernel stack for current */
+ unsigned long oldrsp; /* 24 */ /* user rsp for system call */
+ unsigned long debugstack; /* 32 */ /* #DB/#BP stack. */
+ int irqcount; /* 40 */ /* Irq nesting counter. Starts with -1 */
int cpunumber; /* Logical CPU number */
char *irqstackptr; /* top of irqstack */
int nodenumber; /* number of current node */
_
Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are
git-netdev-all.patch
lockdep-fix-sk_dst_check-deadlock.patch
fstack-protector-feature-annotate-the-pda-offsets.patch
fstack-protector-feature-add-the-kconfig-option.patch
fstack-protector-feature-add-the-canary-field-to-the.patch
fstack-protector-feature-add-the-__stack_chk_fail.patch
fstack-protector-feature-enable-the-compiler-flags.patch
slab-fix-lockdep-warnings.patch
slab-fix-lockdep-warnings-fix.patch
slab-fix-lockdep-warnings-fix-2.patch
sleazy-fpu-feature-i386-support.patch
make-prot_write-imply-prot_read.patch
lockdep-dont-pull-in-includes-when-lockdep-disabled.patch
lockdep-print-kernel-version.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
