direct-io.hg
changeset 5689:1c119c875f21
manual merge
| author | iap10@freefall.cl.cam.ac.uk |
|---|---|
| date | Wed Jul 06 18:56:55 2005 +0000 (2005-07-06) |
| parents | d231efdaa66d bd1642e8599e |
| children | 32fb371cc283 |
| files | .hgignore buildconfigs/mk.linux-2.6-xen linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 patches/linux-2.6.11/smp-alts.patch xen/Makefile |
line diff
7.1 --- a/patches/linux-2.6.11/smp-alts.patch Wed Jul 06 18:55:16 2005 +0000 7.2 +++ b/patches/linux-2.6.11/smp-alts.patch Wed Jul 06 18:56:55 2005 +0000 7.3 @@ -35,7 +35,7 @@ diff -Naur linux-2.6.11/arch/i386/kernel 7.4 diff -Naur linux-2.6.11/arch/i386/kernel/smpalts.c linux-2.6.11.post/arch/i386/kernel/smpalts.c 7.5 --- linux-2.6.11/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 7.6 +++ linux-2.6.11.post/arch/i386/kernel/smpalts.c 2005-06-16 11:23:39.300902424 +0100 7.7 -@@ -0,0 +1,76 @@ 7.8 +@@ -0,0 +1,85 @@ 7.9 +#include <linux/kernel.h> 7.10 +#include <asm/system.h> 7.11 +#include <asm/smp_alt.h> 7.12 @@ -58,6 +58,7 @@ diff -Naur linux-2.6.11/arch/i386/kernel 7.13 + 7.14 +extern struct smp_alternative_record __start_smp_alternatives_table, 7.15 + __stop_smp_alternatives_table; 7.16 ++extern unsigned long __init_begin, __init_end; 7.17 + 7.18 +void prepare_for_smp(void) 7.19 +{ 7.20 @@ -69,6 +70,10 @@ diff -Naur linux-2.6.11/arch/i386/kernel 7.21 + BUG_ON(r->repl->targ_size < r->repl->smp1_size); 7.22 + BUG_ON(r->repl->targ_size < r->repl->smp2_size); 7.23 + BUG_ON(r->repl->targ_size < r->repl->up_size); 7.24 ++ if (system_state == SYSTEM_RUNNING && 7.25 ++ r->targ_start >= (void *)&__init_begin && 7.26 ++ r->targ_start < (void *)&__init_end) 7.27 ++ continue; 7.28 + if (r->repl->feature != (unsigned char)-1 && 7.29 + boot_cpu_has(r->repl->feature)) { 7.30 + memcpy(r->targ_start, 7.31 @@ -101,6 +106,10 @@ diff -Naur linux-2.6.11/arch/i386/kernel 7.32 + BUG_ON(r->repl->targ_size < r->repl->smp1_size); 7.33 + BUG_ON(r->repl->targ_size < r->repl->smp2_size); 7.34 + BUG_ON(r->repl->targ_size < r->repl->up_size); 7.35 ++ if (system_state == SYSTEM_RUNNING && 7.36 ++ r->targ_start >= (void *)&__init_begin && 7.37 ++ r->targ_start < (void *)&__init_end) 7.38 ++ continue; 7.39 + memcpy(r->targ_start, 7.40 + r->repl->data + r->repl->smp1_size + r->repl->smp2_size, 7.41 + r->repl->up_size);