[POWERPC] Include stddef.h in asm-powerpc/current.h to get offsetof
authorOlaf Hering <olaf@aepfle.de>
Sun, 25 Feb 2007 19:04:18 +0000 (20:04 +0100)
committerPaul Mackerras <paulus@samba.org>
Fri, 9 Mar 2007 04:03:24 +0000 (15:03 +1100)
On Tue, Oct 31, Hugh Dickins wrote:

> +++ linux/include/asm-powerpc/current.h 2006-10-30 19:27:05.000000000 +0000

> +static inline struct task_struct *get_current(void)
> +{
> + struct task_struct *task;
> +
> + __asm__ __volatile__("ld %0,%1(13)"
> + : "=r" (task)
> + : "i" (offsetof(struct paca_struct, __current)));

This breaks compile of 2.6.18.8:

  CC [M]  drivers/media/video/pwc/pwc-uncompress.o
In file included from /home/olaf/kernel/linux-2.6.18.8/drivers/media/video/pwc/pwc-uncompress.c:29:
include2/asm/current.h: In function 'get_current':
include2/asm/current.h:23: warning: implicit declaration of function 'offsetof'
include2/asm/current.h:23: error: expected expression before 'struct'
make[5]: *** [drivers/media/video/pwc/pwc-uncompress.o] Error 1

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
include/asm-powerpc/current.h

index b8708aedf925327c13e727d094ad6398b3156850..e2c7f06931e72dfb514b19ef1ff1028306e88891 100644 (file)
@@ -12,6 +12,7 @@
 struct task_struct;
 
 #ifdef __powerpc64__
+#include <linux/stddef.h>
 #include <asm/paca.h>
 
 static inline struct task_struct *get_current(void)