[CRIU] [PATCH 1/4] Ubuntu 12.04 build fixes

[Christopher Covington]

On 07/10/2014 05:22 PM, Christopher Covington wrote:
> Hi Cyrill,
> 
> On 07/10/2014 04:06 PM, Cyrill Gorcunov wrote:
>> On Thu, Jul 10, 2014 at 04:01:34PM -0400, Christopher Covington wrote:
>>> Without these I hit various build errors on Ubuntu 12.04.
>>>
>>> Signed-off-by: Christopher Covington <cov at codeaurora.org>
>>
>> Mind to post the problems, i'm really intersted in headers
>> inclusion movements.
> 
> On 07/10/2014 04:01 PM, Christopher Covington wrote:
> Without these I hit various build errors on Ubuntu 12.04.
>>
>> Signed-off-by: Christopher Covington <cov at codeaurora.org>
>> ---
>>  arch/x86/vdso-pie.c            | 2 +-
>>  arch/x86/vdso.c                | 2 +-
>>  test/zdtm/lib/zdtmtst.h        | 4 ++++
>>  test/zdtm/live/static/Makefile | 1 +
>>  4 files changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/vdso-pie.c b/arch/x86/vdso-pie.c
>> index 327cad9..d84dcc1 100644
>> --- a/arch/x86/vdso-pie.c
>> +++ b/arch/x86/vdso-pie.c
>> @@ -12,11 +12,11 @@
>>   #include "asm/string.h"
>>  #include "asm/types.h"
>> +#include "asm/vdso.h"
>>   #include "compiler.h"
>>  #include "syscall.h"
>>  #include "image.h"
>> -#include "vdso.h"
>>  #include "vma.h"
>>  #include "log.h"
>>  diff --git a/arch/x86/vdso.c b/arch/x86/vdso.c
>> index e7c3842..16d8539 100644
>> --- a/arch/x86/vdso.c
>> +++ b/arch/x86/vdso.c
>> @@ -11,12 +11,12 @@
>>   #include "asm/types.h"
>>  #include "asm/parasite-syscall.h"
>> +#include "asm/vdso.h"
>>   #include "parasite-syscall.h"
>>  #include "parasite.h"
>>  #include "compiler.h"
>>  #include "kerndat.h"
>> -#include "vdso.h"
>>  #include "util.h"
>>  #include "log.h"
>>  #include "mem.h"
> 
> I'm not seeing this one any more. Apologies for that. I'll send updated patches.

Looks like the build error:

arch/x86/vdso-pie.c:38:11: error: ‘struct vdso_symtable’ declared inside
parameter list [-Werror]
arch/x86/vdso-pie.c:38:11: error: its scope is only this definition or
declaration, which is probably not what you want [-Werror]
arch/x86/vdso-pie.c: In function ‘vdso_redirect_calls’:

can pop up when an old config.h which doesn't have VDSO defined is used. A
clean/full rebuild resolves the issue.

Christopher

-- 
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by the Linux Foundation.