Page MenuHomeFreeBSD

D10843.id28708.diff
No OneTemporary

D10843.id28708.diff

Index: stable/10/sys/sys/proc.h
===================================================================
--- stable/10/sys/sys/proc.h
+++ stable/10/sys/sys/proc.h
@@ -528,8 +528,8 @@
LIST_HEAD(, proc) p_children; /* (e) Pointer to list of children. */
struct mtx p_mtx; /* (n) Lock for this struct. */
struct ksiginfo *p_ksi; /* Locked by parent proc lock */
- sigqueue_t p_sigqueue; /* (c) Sigs not delivered to a td. */
-#define p_siglist p_sigqueue.sq_signals
+ uint64_t padding1[4];
+ void *padding2[4];
/* The following fields are all zeroed upon creation in fork. */
#define p_startzero p_oppid
@@ -626,6 +626,8 @@
u_int p_ptevents; /* (c) ptrace() event mask. */
uint16_t p_elf_machine; /* (x) ELF machine type */
uint64_t p_elf_flags; /* (x) ELF flags */
+ sigqueue_t p_sigqueue; /* (c) Sigs not delivered to a td. */
+#define p_siglist p_sigqueue.sq_signals
};
#define p_session p_pgrp->pg_session
Index: stable/11/sys/kern/kern_thread.c
===================================================================
--- stable/11/sys/kern/kern_thread.c
+++ stable/11/sys/kern/kern_thread.c
@@ -87,11 +87,11 @@
"struct proc KBI p_flag");
_Static_assert(offsetof(struct proc, p_pid) == 0xbc,
"struct proc KBI p_pid");
-_Static_assert(offsetof(struct proc, p_filemon) == 0x3d0,
+_Static_assert(offsetof(struct proc, p_filemon) == 0x3c0,
"struct proc KBI p_filemon");
-_Static_assert(offsetof(struct proc, p_comm) == 0x3e0,
+_Static_assert(offsetof(struct proc, p_comm) == 0x3d0,
"struct proc KBI p_comm");
-_Static_assert(offsetof(struct proc, p_emuldata) == 0x4b0,
+_Static_assert(offsetof(struct proc, p_emuldata) == 0x4a0,
"struct proc KBI p_emuldata");
#endif
#ifdef __i386__
@@ -107,11 +107,11 @@
"struct proc KBI p_flag");
_Static_assert(offsetof(struct proc, p_pid) == 0x74,
"struct proc KBI p_pid");
-_Static_assert(offsetof(struct proc, p_filemon) == 0x278,
+_Static_assert(offsetof(struct proc, p_filemon) == 0x268,
"struct proc KBI p_filemon");
-_Static_assert(offsetof(struct proc, p_comm) == 0x284,
+_Static_assert(offsetof(struct proc, p_comm) == 0x274,
"struct proc KBI p_comm");
-_Static_assert(offsetof(struct proc, p_emuldata) == 0x304,
+_Static_assert(offsetof(struct proc, p_emuldata) == 0x2f4,
"struct proc KBI p_emuldata");
#endif
Index: stable/11/sys/sys/proc.h
===================================================================
--- stable/11/sys/sys/proc.h
+++ stable/11/sys/sys/proc.h
@@ -567,8 +567,8 @@
struct mtx p_itimmtx; /* Lock for the virt/prof timers */
struct mtx p_profmtx; /* Lock for the profiling */
struct ksiginfo *p_ksi; /* Locked by parent proc lock */
- sigqueue_t p_sigqueue; /* (c) Sigs not delivered to a td. */
-#define p_siglist p_sigqueue.sq_signals
+ uint64_t padding1[4];
+ void *padding2[4];
/* The following fields are all zeroed upon creation in fork. */
#define p_startzero p_oppid
@@ -660,6 +660,8 @@
u_int p_ptevents; /* (c) ptrace() event mask. */
uint16_t p_elf_machine; /* (x) ELF machine type */
uint64_t p_elf_flags; /* (x) ELF flags */
+ sigqueue_t p_sigqueue; /* (c) Sigs not delivered to a td. */
+#define p_siglist p_sigqueue.sq_signals
};
#define p_session p_pgrp->pg_session

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 6:53 AM (20 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29658063
Default Alt Text
D10843.id28708.diff (3 KB)

Event Timeline