lkml.org 
[lkml]   [2011]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRE: Linux 2.6.38-rc1 doesn't boot
From
Date
On Fri, 2011-01-21 at 15:18 +0800, Shaohua Li wrote:
> On Thu, 2011-01-20 at 23:08 +0800, Anvin, H Peter wrote:
> > (The patch will need to be paired with removing the hacks in the linker script.)
> >
> > -----Original Message-----
> > From: Ingo Molnar [mailto:mingo@elte.hu]
> > Sent: Thursday, January 20, 2011 3:26 AM
> > To: Li, Shaohua
> > Cc: Anvin, H Peter; Markus Trippelsdorf; Lu, Hongjiu; Linus Torvalds; Linux Kernel Mailing List; Sam Ravnborg
> > Subject: Re: Linux 2.6.38-rc1 doesn't boot
> >
> >
> > * Shaohua Li <shaohua.li@intel.com> wrote:
> >
> > > it's not a build failure, without it, my i386 kernel can't boot
> > > actually.
> >
> > Please try hpa's patch in this thread on top of very latest (today's) -git or latest
> > -tip:
> >
> > http://people.redhat.com/mingo/tip.git/README
> >
> > Does that result in a booting system? That way we can avoid most of the linker
> > script madness.
> Need some changes to make it compile and work on both 32 and 64 bit
> kernel. below one is working for me:
Hmm, a slightly modified version of the reverted patch works here for
both 32/64 bit kernels and with old/new binutils too. Maybe we can use
it currently till we remove the link script trick?



diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bf47007..69e5968 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -34,11 +34,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
-jiffies = jiffies_64;
#else
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)
-jiffies_64 = jiffies;
#endif

#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
@@ -142,6 +140,9 @@ SECTIONS
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)

DATA_DATA
+#ifdef CONFIG_X86_32
+ jiffies = jiffies_64;
+#endif
CONSTRUCTORS

/* rarely changed data like cpu maps */
@@ -203,6 +204,7 @@ SECTIONS
*(.jiffies)
}
jiffies = VVIRT(.jiffies);
+ jiffies_64 = jiffies;

.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
*(.vsyscall_3)



\
 
 \ /
  Last update: 2011-01-21 08:57    [W:0.403 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site