From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, "Rafael J. Wysocki" <rjw@sisk.pl>,
Pavel Machek <pavel@suse.cz>
Cc: linux-kernel@vger.kernel.org
Subject: [patch] 2.6.11-rc3-mm1: fix swsusp with gcc 3.4
Date: Fri, 4 Feb 2005 21:11:35 +0100 [thread overview]
Message-ID: <20050204201135.GD19408@stusta.de> (raw)
In-Reply-To: <20050204103350.241a907a.akpm@osdl.org>
On Fri, Feb 04, 2005 at 10:33:50AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.11-rc2-mm2:
>...
> +swsusp-do-not-use-higher-order-memory-allocations-on-suspend.patch
>
> swsusp fix
>...
This broke compilation with gcc 3.4:
<-- snip -->
...
CC kernel/power/swsusp.o
kernel/power/swsusp.c: In function `alloc_pagedir':
kernel/power/swsusp.c:608: sorry, unimplemented: inlining failed in call
to 'free_pagedir': function body not available
kernel/power/swsusp.c:646: sorry, unimplemented: called from here
make[2]: *** [kernel/power/swsusp.o] Error 1
<-- snip -->
The fix is simple:
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
kernel/power/swsusp.c | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
--- linux-2.6.11-rc3-mm1-full/kernel/power/swsusp.c.old 2005-02-04 20:50:16.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/kernel/power/swsusp.c 2005-02-04 20:51:18.000000000 +0100
@@ -605,7 +605,20 @@
return nr_copy;
}
-static inline void free_pagedir(struct pbe *pblist);
+/**
+ * free_pagedir - free pages allocated with alloc_pagedir()
+ */
+
+static inline void free_pagedir(struct pbe *pblist)
+{
+ struct pbe *pbe;
+
+ while (pblist) {
+ pbe = pblist + PB_PAGE_SKIP;
+ pblist = pbe->next;
+ free_page((unsigned long)pblist);
+ }
+}
/**
* alloc_pagedir - Allocate the page directory.
@@ -651,21 +664,6 @@
}
/**
- * free_pagedir - free pages allocated with alloc_pagedir()
- */
-
-static inline void free_pagedir(struct pbe *pblist)
-{
- struct pbe *pbe;
-
- while (pblist) {
- pbe = pblist + PB_PAGE_SKIP;
- pblist = pbe->next;
- free_page((unsigned long)pblist);
- }
-}
-
-/**
* free_image_pages - Free pages allocated for snapshot
*/
next prev parent reply other threads:[~2005-02-04 20:29 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-04 18:33 2.6.11-rc3-mm1 Andrew Morton
2005-02-04 20:11 ` Adrian Bunk [this message]
2005-02-04 21:51 ` [patch] 2.6.11-rc3-mm1: fix swsusp with gcc 3.4 Rafael J. Wysocki
2005-02-05 9:32 ` Pavel Machek
2005-02-04 20:44 ` 2.6.11-rc3-mm1 (compile stats) John Cherry
2005-02-04 21:13 ` Andrew Morton
[not found] ` <1107553914.14618.12.camel@cherrypit.pdx.osdl.net>
2005-02-04 23:31 ` John Cherry
2005-02-04 21:08 ` Add changelog entries for bk-trees? Sam Ravnborg
2005-02-04 22:17 ` 2.6.11-rc3-mm1 Sean Neakums
2005-02-04 23:57 ` 2.6.11-rc3-mm1 Benjamin Herrenschmidt
2005-02-05 0:05 ` 2.6.11-rc3-mm1 Sean Neakums
2005-02-05 0:16 ` 2.6.11-rc3-mm1 Benjamin Herrenschmidt
2005-02-05 0:54 ` 2.6.11-rc3-mm1 Bartlomiej Zolnierkiewicz
2005-02-05 10:48 ` 2.6.11-rc3-mm1 Sean Neakums
2005-02-05 22:35 ` 2.6.11-rc3-mm1 Benjamin Herrenschmidt
2005-02-04 23:50 ` 2.6.11-rc3-mm1: device_resume() hangs on Athlon64 Rafael J. Wysocki
2005-02-05 6:35 ` bk-usb is now safe (was 2.6.11-rc3-mm1) Greg KH
2005-02-05 8:47 ` 2.6.11-rc3-mm1 : can't insmod dm-mod Laurent Riffard
2005-02-05 11:26 ` Andrew Morton
2005-02-05 13:25 ` Laurent Riffard
2005-02-05 16:29 ` Christoph Hellwig
2005-02-05 20:03 ` Al Viro
2005-02-05 12:23 ` 2.6.11-rc3-mm1 William Lee Irwin III
2005-02-05 12:44 ` 2.6.11-rc3-mm1: kobject_register fails for processor on Athlon64 Rafael J. Wysocki
2005-02-05 13:11 ` 2.6.11-rc3-mm1: softlockup and suspend/resume Rafael J. Wysocki
2005-02-05 14:35 ` Ingo Molnar
2005-02-05 14:48 ` Rafael J. Wysocki
2005-02-05 19:07 ` Ingo Molnar
2005-02-06 19:15 ` Rafael J. Wysocki
2005-02-07 8:57 ` Ingo Molnar
2005-02-07 12:53 ` Rafael J. Wysocki
2005-02-08 11:04 ` Ingo Molnar
2005-02-09 16:35 ` Rafael J. Wysocki
2005-02-10 0:22 ` 2.6.11-rc3-mm1: softlockup and suspend/resume [update] Rafael J. Wysocki
2005-02-05 19:48 ` 2.6.11-rc3-mm1: softlockup and suspend/resume Pavel Machek
2005-02-05 19:47 ` Pavel Machek
2005-02-05 18:10 ` 2.6.11-rc3-mm1 Rogério Brito
2005-02-05 18:43 ` 2.6.11-rc3-mm1 Jurriaan
2005-02-05 22:28 ` 2.6.11-rc3-mm1 Rogério Brito
2005-02-05 22:45 ` irq 10: nobody cared! (was: Re: 2.6.11-rc3-mm1) Rogério Brito
2005-02-05 22:48 ` Rogério Brito
2005-02-06 2:36 ` William Park
2005-02-06 9:07 ` Rogério Brito
2005-02-12 22:21 ` William Park
2005-02-12 22:47 ` Rogério Brito
2005-02-12 23:21 ` William Park
2005-02-12 23:50 ` Rogério Brito
2005-02-13 1:41 ` William Park
2005-02-13 16:37 ` Rogério Brito
2005-02-13 16:56 ` Rogério Brito
2005-02-13 18:49 ` [Partially solved] " Rogério Brito
2005-02-06 10:07 ` 2.6.11-rc3-mm1 Peter Osterlund
2005-02-06 10:33 ` 2.6.11-rc3-mm1 Benjamin Herrenschmidt
2005-02-06 12:14 ` 2.6.11-rc3-mm1 Peter Osterlund
2005-02-06 21:22 ` 2.6.11-rc3-mm1 Peter Osterlund
2005-02-07 17:22 ` 2.6.11-rc3-mm1 Robert Love
2005-02-08 23:08 ` 2.6.11-rc3-mm1 Peter Osterlund
2005-02-06 12:30 ` 2.6.11-rc3-mm1 Joseph Fannin
2005-02-09 3:58 ` 2.6.11-rc3-mm1 Marcos D. Marado Torres
2005-02-09 4:54 ` 2.6.11-rc3-mm1 Andrew Morton
2005-02-09 8:55 ` 2.6.11-rc3-mm1 Barry K. Nathan
2005-02-09 5:00 ` 2.6.11-rc3-mm1 Zwane Mwaikambo
2005-02-10 4:12 ` 2.6.11-rc3-mm1 Andrew Morton
2005-02-10 4:32 ` 2.6.11-rc3-mm1 Barry K. Nathan
2005-02-09 5:59 ` 2.6.11-rc3-mm1: two oops on startup Clemens Schwaighofer
2005-02-09 6:09 ` Andrew Morton
2005-02-09 6:14 ` Clemens Schwaighofer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050204201135.GD19408@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@suse.cz \
--cc=rjw@sisk.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).