From: Thomas Schlichter <schlicht@uni-mannheim.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: Re: 2.5.74-mm3
Date: Wed, 9 Jul 2003 11:05:59 +0200 [thread overview]
Message-ID: <200307091106.00781.schlicht@uni-mannheim.de> (raw)
In-Reply-To: <20030708223548.791247f5.akpm@osdl.org>
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
> -cpumask_t-1.patch
> -gcc-bug-workaround.patch
> -sparse-apic-fix.patch
> -nuke-cpumask_arith.patch
> -p4-clockmod-cpumask-fix.patch
>
> Folded into cpumask_t-1.patch
This gives following compile error when compiling the kernel with APM support
for UP:
arch/i386/kernel/apm.c: In function `apm_bios_call':
arch/i386/kernel/apm.c:600: error: incompatible types in assignment
arch/i386/kernel/apm.c: In function `apm_bios_call_simple':
arch/i386/kernel/apm.c:643: error: incompatible types in assignment
The attached patch fixes this...
Best regards
Thomas Schlichter
[-- Attachment #2: fix_up_apm.diff --]
[-- Type: text/x-diff, Size: 1328 bytes --]
--- linux-2.5.74-mm3/arch/i386/kernel/apm.c.orig Wed Jul 9 10:25:46 2003
+++ linux-2.5.74-mm3/arch/i386/kernel/apm.c Wed Jul 9 10:40:42 2003
@@ -508,13 +508,12 @@
#ifdef CONFIG_SMP
-static cpumask_t apm_save_cpus(void)
+static inline void apm_save_cpus(cpumask_t *mask)
{
- cpumask_t x = current->cpus_allowed;
+ *mask = current->cpus_allowed;
/* Some bioses don't like being called from CPU != 0 */
set_cpus_allowed(current, cpumask_of_cpu(0));
BUG_ON(smp_processor_id() != 0);
- return x;
}
static inline void apm_restore_cpus(cpumask_t mask)
@@ -528,7 +527,7 @@
* No CPU lockdown needed on a uniprocessor
*/
-#define apm_save_cpus() 0
+#define apm_save_cpus(x) (void)(x)
#define apm_restore_cpus(x) (void)(x)
#endif
@@ -597,7 +596,7 @@
int cpu;
struct desc_struct save_desc_40;
- cpus = apm_save_cpus();
+ apm_save_cpus(&cpus);
cpu = get_cpu();
save_desc_40 = cpu_gdt_table[cpu][0x40 / 8];
@@ -640,7 +639,7 @@
struct desc_struct save_desc_40;
- cpus = apm_save_cpus();
+ apm_save_cpus(&cpus);
cpu = get_cpu();
save_desc_40 = cpu_gdt_table[cpu][0x40 / 8];
@@ -918,7 +917,8 @@
#endif
if (apm_info.realmode_power_off)
{
- (void)apm_save_cpus();
+ cpumask_t dummy;
+ apm_save_cpus(&dummy);
machine_real_restart(po_bios_call, sizeof(po_bios_call));
}
else
next prev parent reply other threads:[~2003-07-09 8:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-09 5:35 2.5.74-mm3 Andrew Morton
2003-07-09 9:05 ` Thomas Schlichter [this message]
2003-07-09 9:18 ` 2.5.74-mm3 Andrew Morton
2003-07-09 9:25 ` 2.5.74-mm3 Thomas Schlichter
2003-07-09 9:38 ` 2.5.74-mm3 Marc-Christian Petersen
2003-07-09 11:23 ` 2.5.74-mm3 Jan De Luyck
2003-07-09 13:23 ` 2.5.74-mm3 Ramón Rey Vicente
2003-07-10 5:44 ` 2.5.74-mm3 - apm_save_cpus() Macro still bombs out Piet Delaney
2003-07-10 6:08 ` William Lee Irwin III
2003-07-10 7:10 ` William Lee Irwin III
2003-07-10 7:18 ` Andrew Morton
2003-07-10 7:59 ` William Lee Irwin III
2003-07-10 4:09 ` hptraid.o -- No array found? Seth Chromick
2003-07-10 12:20 ` Alan Cox
2003-07-10 8:15 ` 2.5.74-mm3 - module-init-tools: necessary to replace root copies? Piet Delaney
2003-07-10 8:15 ` Piet Delaney
2003-07-10 8:23 ` Andrew Morton
2003-07-10 9:22 ` 2.5.74-mm3 - apm_save_cpus() Macro still bombs out Thomas Schlichter
2003-07-10 9:27 ` William Lee Irwin III
2003-07-10 9:42 ` Thomas Schlichter
2003-07-10 9:48 ` William Lee Irwin III
2003-07-10 9:59 ` Thomas Schlichter
2003-07-10 10:30 ` William Lee Irwin III
2003-07-10 10:49 ` Thomas Schlichter
2003-07-11 14:56 ` Matt Mackall
2003-07-09 9:24 ` 2.5.74-mm3 Matt Mackall
2003-07-09 9:29 ` 2.5.74-mm3 William Lee Irwin III
2003-07-10 18:21 ` 2.5.74-mm3 Valdis.Kletnieks
2003-07-11 8:25 ` 2.5.74-mm3 Joe Thornber
2003-07-11 16:02 ` 2.5.74-mm3 Anton Blanchard
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=200307091106.00781.schlicht@uni-mannheim.de \
--to=schlicht@uni-mannheim.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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).