From: "Martin J. Bligh" <Martin.Bligh@us.ibm.com>
To: Alessandro Suardi <alessandro.suardi@oracle.com>
Cc: Dan Merillat <harik@chaos.ao.net>, linux-kernel@vger.kernel.org
Subject: Re: Wierd /proc/cpuinfo with 2.4.11-pre4
Date: Fri, 05 Oct 2001 16:07:44 -0700 [thread overview]
Message-ID: <1570684149.1002298064@mbligh.des.sequent.com> (raw)
In-Reply-To: <3BBE3DD4.27DFFDCE@oracle.com>
> Doesn't build here...
Looks like you need the other patch I posted here too.
M.
Combined reformated patch below:
diff -urN virgin-2.4.11-pre4/arch/i386/kernel/setup.c numa-2.4.11-pre4/arch/i386/kernel/setup.c
--- virgin-2.4.11-pre4/arch/i386/kernel/setup.c Fri Oct 5 15:39:54 2001
+++ numa-2.4.11-pre4/arch/i386/kernel/setup.c Fri Oct 5 15:42:37 2001
@@ -2420,7 +2420,7 @@
* WARNING - nasty evil hack ... if we print > 8, it overflows the
* page buffer and corrupts memory - this needs fixing properly
*/
- for (n = 0; n < 8; n++, c++) {
+ for (n = 0; n < (clustered_apic_mode ? 8 : NR_CPUS); n++, c++) {
/* for (n = 0; n < NR_CPUS; n++, c++) { */
int fpu_exception;
#ifdef CONFIG_SMP
diff -urN virgin-2.4.11-pre4/include/asm-i386/smp.h numa-2.4.11-pre4/include/asm-i386/smp.h
--- virgin-2.4.11-pre4/include/asm-i386/smp.h Fri Oct 5 15:40:46 2001
+++ numa-2.4.11-pre4/include/asm-i386/smp.h Fri Oct 5 15:44:57 2001
@@ -22,7 +22,7 @@
#endif
#endif
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
# ifdef CONFIG_MULTIQUAD
# define TARGET_CPUS 0xf /* all CPUs in *THIS* quad */
# define INT_DELIVERY_MODE 0 /* physical delivery on LOCAL quad */
@@ -31,9 +31,20 @@
# define INT_DELIVERY_MODE 1 /* logical delivery broadcast to all procs */
# endif
#else
+# define INT_DELIVERY_MODE 0 /* physical delivery on LOCAL quad */
# define TARGET_CPUS 0x01
#endif
+#ifndef clustered_apic_mode
+ #ifdef CONFIG_MULTIQUAD
+ #define clustered_apic_mode (1)
+ #define esr_disable (1)
+ #else /* !CONFIG_MULTIQUAD */
+ #define clustered_apic_mode (0)
+ #define esr_disable (0)
+ #endif /* CONFIG_MULTIQUAD */
+#endif
+
#ifdef CONFIG_SMP
#ifndef ASSEMBLY
@@ -76,16 +87,6 @@
extern volatile int physical_apicid_to_cpu[MAX_APICID];
extern volatile int cpu_to_logical_apicid[NR_CPUS];
extern volatile int logical_apicid_to_cpu[MAX_APICID];
-
-#ifndef clustered_apic_mode
- #ifdef CONFIG_MULTIQUAD
- #define clustered_apic_mode (1)
- #define esr_disable (1)
- #else /* !CONFIG_MULTIQUAD */
- #define clustered_apic_mode (0)
- #define esr_disable (0)
- #endif /* CONFIG_MULTIQUAD */
-#endif
/*
* General functions that each host system must provide.
next prev parent reply other threads:[~2001-10-05 23:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-10-05 18:16 Wierd /proc/cpuinfo with 2.4.11-pre4 Dan Merillat
2001-10-05 21:45 ` Alessandro Suardi
2001-10-05 21:58 ` Martin J. Bligh
2001-10-05 23:10 ` Alessandro Suardi
2001-10-05 23:07 ` Martin J. Bligh [this message]
2001-10-06 0:37 ` Alessandro Suardi
2001-10-05 23:18 ` Andreas Dilger
2001-10-05 23:20 ` Martin J. Bligh
2001-10-05 23:17 ` Brian Gerst
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=1570684149.1002298064@mbligh.des.sequent.com \
--to=martin.bligh@us.ibm.com \
--cc=alessandro.suardi@oracle.com \
--cc=harik@chaos.ao.net \
--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