Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b523fb5 authored by Andrew Morton's avatar Andrew Morton Committed by Andi Kleen
Browse files

[PATCH] i386: VDSO_PRELINK warning fix 



The lguest patches somehow managed to trigger this:

In file included from arch/i386/lguest/lguest.c:38:
include/asm/asm-offsets.h:67:1: warning: "VDSO_PRELINK" redefined
In file included from include/linux/elf.h:7,
                 from include/linux/module.h:15,
                 from include/linux/device.h:21,
                 from include/linux/interrupt.h:15,
                 from arch/i386/lguest/lguest.c:27:
include/asm/elf.h:140:1: warning: this is the location of the previous definition

I assume that using the same identifier twice was a bad idea..

Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 20280195

arch/i386/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void foo(void) 
		 sizeof(struct tss_struct));



	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);

	DEFINE(VDSO_PRELINK, VDSO_PRELINK);

	DEFINE(VDSO_PRELINK_asm, VDSO_PRELINK);



	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);

arch/i386/kernel/vsyscall.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


SECTIONS

{

  . = VDSO_PRELINK + SIZEOF_HEADERS;

  . = VDSO_PRELINK_asm + SIZEOF_HEADERS;



  .hash           : { *(.hash) }		:text

  .gnu.hash       : { *(.gnu.hash) }
@@ -21,7 +21,7 @@ SECTIONS 
     For the layouts to match, we need to skip more than enough

     space for the dynamic symbol table et al.  If this amount

     is insufficient, ld -shared will barf.  Just increase it here.  */

  . = VDSO_PRELINK + 0x400;

  . = VDSO_PRELINK_asm + 0x400;



  .text           : { *(.text) }		:text =0x90909090

  .note		  : { *(.note.*) }		:text :note