2006-12-04 23:17:10

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 1/4] UML - include stddef.h correctly

We were not including stddef.h in files that used offsetof.

One file was also including linux/stddef.h for no perciptible reason.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.18-mm/arch/um/sys-i386/ldt.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/sys-i386/ldt.c 2006-12-04 14:25:45.000000000 -0500
+++ linux-2.6.18-mm/arch/um/sys-i386/ldt.c 2006-12-04 14:26:12.000000000 -0500
@@ -3,7 +3,6 @@
* Licensed under the GPL
*/

-#include "linux/stddef.h"
#include "linux/sched.h"
#include "linux/slab.h"
#include "linux/types.h"
Index: linux-2.6.18-mm/arch/um/sys-i386/ptrace_user.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/sys-i386/ptrace_user.c 2006-12-04 14:25:45.000000000 -0500
+++ linux-2.6.18-mm/arch/um/sys-i386/ptrace_user.c 2006-12-04 14:26:12.000000000 -0500
@@ -4,9 +4,9 @@
*/

#include <stdio.h>
+#include <stddef.h>
#include <errno.h>
#include <unistd.h>
-#include <linux/stddef.h>
#include "ptrace_user.h"
/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
#include <asm/user.h>
Index: linux-2.6.18-mm/arch/um/sys-i386/user-offsets.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/sys-i386/user-offsets.c 2006-12-04 14:25:45.000000000 -0500
+++ linux-2.6.18-mm/arch/um/sys-i386/user-offsets.c 2006-12-04 14:26:12.000000000 -0500
@@ -2,7 +2,7 @@
#include <signal.h>
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <linux/stddef.h>
+#include <stddef.h>
#include <sys/poll.h>

#define DEFINE(sym, val) \