From: Andrew Morton <akpm@osdl.org>
To: Michael Bakos <bakhos@msi.umn.edu>
Cc: linux-kernel@vger.kernel.org
Subject: Re: compile error for Opteron CPU with kernel 2.6.0-test2
Date: Thu, 31 Jul 2003 18:27:05 -0700 [thread overview]
Message-ID: <20030731182705.5b4f2b33.akpm@osdl.org> (raw)
In-Reply-To: <Pine.SGI.4.33.0307312008210.23301-100000@ir12.msi.umn.edu>
Michael Bakos <bakhos@msi.umn.edu> wrote:
>
> In file included from include/linux/topology.h:35,
> from include/linux/mmzone.h:294,
> from include/linux/gfp.h:4,
> from include/linux/slab.h:15,
> from include/linux/percpu.h:4,
> from include/linux/sched.h:31,
> from arch/x86_64/kernel/asm-offsets.c:7:
> include/asm/topology.h: In function `pcibus_to_cpumask':
> include/asm/topology.h:24: error: invalid operands to binary &
> make[1]: *** [arch/x86_64/kernel/asm-offsets.s] Error 1
> make: *** [arch/x86_64/kernel/asm-offsets.s] Error 2
urgh, OK. We're chasing around in circles here. And the cpumask_t patch
still isn't ready for merging.
This might fix it.
arch/x86_64/kernel/mpparse.c | 2 +-
include/asm-x86_64/mpspec.h | 2 +-
include/asm-x86_64/topology.h | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff -puN include/asm-x86_64/topology.h~x86_64-cpumask_t-fix include/asm-x86_64/topology.h
--- 25/include/asm-x86_64/topology.h~x86_64-cpumask_t-fix 2003-07-31 18:20:51.000000000 -0700
+++ 25-akpm/include/asm-x86_64/topology.h 2003-07-31 18:25:11.000000000 -0700
@@ -19,9 +19,12 @@ extern cpumask_t cpu_online_map;
#define node_to_cpu_mask(node) (fake_node ? cpu_online_map : cpumask_of_cpu(node))
#define node_to_memblk(node) (node)
-static inline unsigned long pcibus_to_cpumask(int bus)
+static inline cpumask_t pcibus_to_cpumask(int bus)
{
- return mp_bus_to_cpumask[bus] & cpu_online_map;
+ cpumask_t ret;
+
+ cpus_and(ret, mp_bus_to_cpumask[bus], cpu_online_map);
+ return ret;
}
#define NODE_BALANCE_RATE 30 /* CHECKME */
diff -puN include/asm-x86_64/mpspec.h~x86_64-cpumask_t-fix include/asm-x86_64/mpspec.h
--- 25/include/asm-x86_64/mpspec.h~x86_64-cpumask_t-fix 2003-07-31 18:24:12.000000000 -0700
+++ 25-akpm/include/asm-x86_64/mpspec.h 2003-07-31 18:24:35.000000000 -0700
@@ -166,7 +166,7 @@ enum mp_bustype {
};
extern unsigned char mp_bus_id_to_type [MAX_MP_BUSSES];
extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
-extern unsigned long mp_bus_to_cpumask [MAX_MP_BUSSES];
+extern cpumask_t mp_bus_to_cpumask [MAX_MP_BUSSES];
extern unsigned int boot_cpu_physical_apicid;
extern cpumask_t phys_cpu_present_map;
diff -puN arch/x86_64/kernel/mpparse.c~x86_64-cpumask_t-fix arch/x86_64/kernel/mpparse.c
--- 25/arch/x86_64/kernel/mpparse.c~x86_64-cpumask_t-fix 2003-07-31 18:24:54.000000000 -0700
+++ 25-akpm/arch/x86_64/kernel/mpparse.c 2003-07-31 18:25:45.000000000 -0700
@@ -43,7 +43,7 @@ int acpi_found_madt;
int apic_version [MAX_APICS];
unsigned char mp_bus_id_to_type [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
-unsigned long mp_bus_to_cpumask [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1UL };
+cpumask_t mp_bus_to_cpumask [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = CPU_MASK_ALL };
int mp_current_pci_id = 0;
/* I/O APIC entries */
_
next prev parent reply other threads:[~2003-08-01 1:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-31 15:59 Michael Bakos
2003-07-31 21:59 ` Andrew Morton
2003-08-01 1:08 ` Michael Bakos
2003-08-01 1:11 ` Michael Bakos
2003-08-01 1:27 ` Andrew Morton [this message]
2003-08-01 2:39 ` Michael Bakos
2003-08-01 4:21 ` Andrew Morton
2003-08-01 14:36 ` Andrew de Quincey
2003-08-01 3:12 ` Michael Bakos
2003-08-01 18:01 ` Bryan O'Sullivan
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=20030731182705.5b4f2b33.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=bakhos@msi.umn.edu \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®