2003-07-20 09:08:51

by Simon Fowler

[permalink] [raw]
Subject: [PATCH] Compile fix for suspend.c

kernel/suspend.c fails to build as of a bk pull at about 08:00 UTC,
with redefinitions of _text.

The attached patch fixes the build.

Simon

===== kernel/suspend.c 1.42 vs edited =====
--- 1.42/kernel/suspend.c Sat May 3 04:16:11 2003
+++ edited/kernel/suspend.c Sun Jul 20 19:14:48 2003
@@ -83,7 +83,6 @@
#define ADDRESS2(x) __ADDRESS(__pa(x)) /* Needed for x86-64 where some pages are in m
emory twice */

/* References to section boundaries */
-extern char _text, _etext, _edata, __bss_start, _end;
extern char __nosave_begin, __nosave_end;

extern int is_head_of_free_region(struct page *);

--
PGP public key Id 0x144A991C, or http://himi.org/stuff/himi.asc
(crappy) Homepage: http://himi.org
doe #237 (see http://www.lemuria.org/DeCSS)
My DeCSS mirror: ftp://himi.org/pub/mirrors/css/


Attachments:
(No filename) (820.00 B)
(No filename) (189.00 B)
Download all attachments

2003-07-20 11:19:29

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] Compile fix for suspend.c

Hi!

> kernel/suspend.c fails to build as of a bk pull at about 08:00 UTC,
> with redefinitions of _text.
>
> The attached patch fixes the build.

Can you send me your config? I did checkout from bkcvs, and it seems
to compile okay.
Pavel

--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]

2003-07-20 13:06:19

by Simon Fowler

[permalink] [raw]
Subject: Re: [PATCH] Compile fix for suspend.c

On Sun, Jul 20, 2003 at 01:33:53PM +0200, Pavel Machek wrote:
> Hi!
>
> > kernel/suspend.c fails to build as of a bk pull at about 08:00 UTC,
> > with redefinitions of _text.
> >
> > The attached patch fixes the build.
>
> Can you send me your config? I did checkout from bkcvs, and it seems
> to compile okay.
> Pavel
Attached . . .

Simon

--
PGP public key Id 0x144A991C, or http://himi.org/stuff/himi.asc
(crappy) Homepage: http://himi.org
doe #237 (see http://www.lemuria.org/DeCSS)
My DeCSS mirror: ftp://himi.org/pub/mirrors/css/


Attachments:
(No filename) (0.00 B)
(No filename) (189.00 B)
Download all attachments

2003-07-20 19:02:53

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] Compile fix for suspend.c

Hi!

> kernel/suspend.c fails to build as of a bk pull at about 08:00 UTC,
> with redefinitions of _text.

You were right; I can see the error, too. And your fix is right, since
current suspend.c no longer uses these sections. (It still uses
__nosave_begin/_end, through).
Pavel

> ===== kernel/suspend.c 1.42 vs edited =====
> --- 1.42/kernel/suspend.c Sat May 3 04:16:11 2003
> +++ edited/kernel/suspend.c Sun Jul 20 19:14:48 2003
> @@ -83,7 +83,6 @@
> #define ADDRESS2(x) __ADDRESS(__pa(x)) /* Needed for x86-64 where some pages are in m
> emory twice */
>
> /* References to section boundaries */
> -extern char _text, _etext, _edata, __bss_start, _end;
> extern char __nosave_begin, __nosave_end;
>
> extern int is_head_of_free_region(struct page *);
>



--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]