lkml.org 
[lkml]   [2008]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: build error on x86_64 with x86.git#latest
On Wed, Apr 9, 2008 at 2:01 PM, Pavel Machek <pavel@ucw.cz> wrote:
> Hi!
>
>
> > > commit 0465ac59164eda30f4fe49006a67dd6d2c9fc3cf
> > > Author: Pavel Machek <pavel@suse.cz>
> > > Date: Wed Feb 20 01:48:39 2008 +0100
> > >
> > > suspend: wakeup code in c
> >
> > oops, that was not meant to be pushed out at all - it was just a
> > temporary merge which clearly needed more work.
> >
> > it's all fixed up now - please let me know if you still see any
> > problems.
>
> Is there something I could do to pull this? Lu, could you post the patch
> to fix the first problem you hit?
>

but Ingo already pulled off your patch.

YH
Index: linux-2.6/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/smpboot.c
+++ linux-2.6/arch/x86/kernel/smpboot.c
@@ -61,6 +61,7 @@
#include <asm/nmi.h>
#include <asm/vmi.h>
#include <linux/mc146818rtc.h>
+#include <asm/trampoline.h>

#include <mach_apic.h>
#include <mach_wakecpu.h>
Index: linux-2.6/include/asm-x86/smp.h
===================================================================
--- linux-2.6.orig/include/asm-x86/smp.h
+++ linux-2.6/include/asm-x86/smp.h
@@ -59,7 +59,8 @@ extern struct {
} stack_start;

extern unsigned long init_rsp;
-extern unsigned long initial_code;
+/*extern unsigned long initial_code;*/
+extern void (*initial_code)(void);

struct smp_ops {
void (*smp_prepare_boot_cpu)(void);[unhandled content-type:application/octet-stream]
\
 
 \ /
  Last update: 2008-04-09 23:15    [W:0.129 / U:0.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site