From 91c2d25df3c32cc27dd2359906e6ca9e15c28679 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 1 May 2005 08:58:54 -0700 Subject: [PATCH] --- yaml --- r: 687 b: refs/heads/master c: e9c527163d31da9f616e989a90429729525c5233 h: refs/heads/master i: 685: 8d3ddcb8e49c886cdb7b8426f4dab72d28e71956 683: 1de6463dcb2ca774e3fa7c5f37a86053e3fe0504 679: 83b13008b9a011d38350af3d7b94a8258e155c91 671: e3954d2bd8bef8840c21935690e74e462f42abda v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/skas/uaccess.c | 4 ++-- trunk/include/linux/compiler-gcc2.h | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 37b9e5bb15aa..8d38705a13c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c16993d9009b4311f0e6088af38844eabc8b5e5b +refs/heads/master: e9c527163d31da9f616e989a90429729525c5233 diff --git a/trunk/arch/um/kernel/skas/uaccess.c b/trunk/arch/um/kernel/skas/uaccess.c index 7575ec489b63..f7da9d027672 100644 --- a/trunk/arch/um/kernel/skas/uaccess.c +++ b/trunk/arch/um/kernel/skas/uaccess.c @@ -3,6 +3,7 @@ * Licensed under the GPL */ +#include "linux/compiler.h" #include "linux/stddef.h" #include "linux/kernel.h" #include "linux/string.h" @@ -61,8 +62,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) void *arg; int *res; - /* Some old gccs recognize __va_copy, but not va_copy */ - __va_copy(args, *(va_list *)arg_ptr); + va_copy(args, *(va_list *)arg_ptr); addr = va_arg(args, unsigned long); len = va_arg(args, int); is_write = va_arg(args, int); diff --git a/trunk/include/linux/compiler-gcc2.h b/trunk/include/linux/compiler-gcc2.h index 5a359153ffd9..ebed17660c5f 100644 --- a/trunk/include/linux/compiler-gcc2.h +++ b/trunk/include/linux/compiler-gcc2.h @@ -22,3 +22,8 @@ # define __attribute_pure__ __attribute__((pure)) # define __attribute_const__ __attribute__((__const__)) #endif + +/* GCC 2.95.x/2.96 recognize __va_copy, but not va_copy. Actually later GCC's + * define both va_copy and __va_copy, but the latter may go away, so limit this + * to this header */ +#define va_copy __va_copy