From: Guillaume Thouvenin This patch fixes a compile breakage with gcc 2.95 due to an unnamed struct/union that doesn't define any instances. Thank you to Adrian Bunk for reporting the problem and testing the new patch. Signed-off-by: Signed-off-by: Andrew Morton --- drivers/connector/cn_fork.c | 10 +++++----- include/linux/cn_fork.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/connector/cn_fork.c~fork-connector-send-status-to-userspace-fix drivers/connector/cn_fork.c --- 25/drivers/connector/cn_fork.c~fork-connector-send-status-to-userspace-fix 2005-05-31 02:36:00.000000000 -0700 +++ 25-akpm/drivers/connector/cn_fork.c 2005-05-31 02:36:00.000000000 -0700 @@ -72,10 +72,10 @@ void fork_connector(pid_t ppid, pid_t pt forkmsg = (struct cn_fork_msg *)msg->data; forkmsg->type = FORK_CN_MSG_P; forkmsg->cpu = smp_processor_id(); - forkmsg->ppid = ppid; - forkmsg->ptid = ptid; - forkmsg->cpid = cpid; - forkmsg->ctid = ctid; + forkmsg->u.s.ppid = ppid; + forkmsg->u.s.ptid = ptid; + forkmsg->u.s.cpid = cpid; + forkmsg->u.s.ctid = ctid; put_cpu_var(fork_counts); @@ -107,7 +107,7 @@ static inline void cn_fork_send_status(v msg->len = CN_FORK_INFO_SIZE; forkmsg = (struct cn_fork_msg *)msg->data; forkmsg->type = FORK_CN_MSG_S; - forkmsg->status = cn_fork_enable; + forkmsg->u.status = cn_fork_enable; cn_netlink_send(msg, CN_IDX_FORK, GFP_KERNEL); } diff -puN include/linux/cn_fork.h~fork-connector-send-status-to-userspace-fix include/linux/cn_fork.h --- 25/include/linux/cn_fork.h~fork-connector-send-status-to-userspace-fix 2005-05-31 02:36:00.000000000 -0700 +++ 25-akpm/include/linux/cn_fork.h 2005-05-31 02:36:00.000000000 -0700 @@ -55,9 +55,9 @@ struct cn_fork_msg { pid_t ptid; /* parent thread ID */ pid_t cpid; /* child process ID */ pid_t ctid; /* child thread ID */ - }; + } s; int status; - }; + } u; }; /* Code above is only inside the kernel */ _