public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <ak@suse.de>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: Intel x86-64 support patch breaks amd64
Date: Fri, 20 Feb 2004 17:13:37 +0100	[thread overview]
Message-ID: <20040220171337.10cd1ae8.ak@suse.de> (raw)
In-Reply-To: <20040219183448.GB8960@atomide.com>

On Thu, 19 Feb 2004 10:34:49 -0800
Tony Lindgren <tony@atomide.com> wrote:

> I guess you probably already know about this, but the recent changeset
> 1.1561.1.1 breaks compiling and booting for amd64.

You need the appended patch to build on Uni Processor again. I already
submitted it to Linus, but he doesn't seem to have merged it yet
(or alternatively compile for SMP) 

> After #if 0 out some parts to make it compile, it fails to boot with no
> output at all. Sorry, don't have low level debugging or serial console on 
> this machine configured, let me know if you need further information.

It works for me with this patch both UP and SMP. Maybe you commented out 
too much? 

-Andi

diff -u linux-2.6.3/arch/x86_64/kernel/setup.c-o linux-2.6.3/arch/x86_64/kernel/setup.c
--- linux-2.6.3/arch/x86_64/kernel/setup.c-o	2004-02-19 09:01:09.000000000 +0100
+++ linux-2.6.3/arch/x86_64/kernel/setup.c	2004-02-19 09:09:27.000000000 +0100
@@ -588,6 +588,7 @@
 
 static void __init detect_ht(void)
 {
+#ifdef CONFIG_SMP
 	extern	int phys_proc_id[NR_CPUS];
 	
 	u32 	eax, ebx, ecx, edx;
@@ -631,6 +632,7 @@
 		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",
 		       phys_proc_id[cpu]);
 	}
+#endif
 }
 	
 #define LVL_1_INST	1
diff -u linux-2.6.3/arch/x86_64/kernel/Makefile-o linux-2.6.3/arch/x86_64/kernel/Makefile
--- linux-2.6.3/arch/x86_64/kernel/Makefile-o	2004-02-19 09:01:09.000000000 +0100
+++ linux-2.6.3/arch/x86_64/kernel/Makefile	2004-02-19 09:15:41.000000000 +0100
@@ -33,4 +33,4 @@
 cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/mach-default/topology.o
 swiotlb-$(CONFIG_SWIOTLB)      += ../../ia64/lib/swiotlb.o
-microcode-$(CONFIG_MICROCODE)  += ../../i386/kernel/microcode.o
+microcode-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/microcode.o
diff -u linux-2.6.3/arch/x86_64/kernel/x8664_ksyms.c-o linux-2.6.3/arch/x86_64/kernel/x8664_ksyms.c
--- linux-2.6.3/arch/x86_64/kernel/x8664_ksyms.c-o	2004-02-19 09:01:09.000000000 +0100
+++ linux-2.6.3/arch/x86_64/kernel/x8664_ksyms.c	2004-02-19 09:08:04.000000000 +0100
@@ -194,7 +194,9 @@
 
 EXPORT_SYMBOL(die_chain);
 
+#ifdef CONFIG_SMP_
 EXPORT_SYMBOL(cpu_sibling_map);
+#endif
 
 extern void do_softirq_thunk(void);
 EXPORT_SYMBOL_NOVERS(do_softirq_thunk);

  reply	other threads:[~2004-02-19 19:25 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-02-19 18:34 Intel x86-64 support patch breaks amd64 Tony Lindgren
2004-02-20 16:13 ` Andi Kleen [this message]
2004-02-19 19:36   ` Jakub Jelinek
2004-02-20 16:44     ` Andi Kleen
2004-02-19 21:20       ` Philippe Elie
2004-02-20 19:32         ` [PATCH] Fix typo in x86-64 fix Andi Kleen
2004-02-19 20:39   ` Intel x86-64 support patch breaks amd64 Tony Lindgren
2004-02-20 19:02     ` Andi Kleen
  -- strict thread matches above, loose matches on Subject: below --
2004-02-19 20:45 Siddha, Suresh B
2004-02-20 19:29 ` Andi Kleen
2004-02-19 21:14   ` Tony Lindgren
2004-02-19 21:14 Siddha, Suresh B
2004-02-20 20:12 ` Andi Kleen

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=20040220171337.10cd1ae8.ak@suse.de \
    --to=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tony@atomide.com \
    /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