| |
|
 |
|
 |
|
|
|
| |
|
|
xen-ia64-devel
Re: [PATCH] clean up xen_mkbuildtree_pre (was Re: [Xen-ia64-devel] xen-d
supplement:
The patch is also valid for p=m model.
I could boot dom0 of p=m model and domU applying this patch to
the change set 9859:adb151aaf3f8 of xen-ia64-unstable.hg.
On Tue, May 02, 2006 at 09:09:41PM +0900, Isaku Yamahata wrote:
> On Mon, May 01, 2006 at 02:46:04PM -0700, Magenheimer, Dan (HP Labs Fort
> Collins) wrote:
>
> > Also, with all your VP changes, could you look at the
> > file -sparse/arch/ia64/xen-mkbuildtree-pre and see
> > how many files/dirs still need to be mv'd? Perhaps we
> > are close enough now that we can insert some ifdef's
> > directly into any remaining conflicting files rather
> > than rm/mv them?
>
> I found that only linux-2.6-xen-sparse/mm/Kconfig is needed to be mv.
> for mm/Kconfig.
> The patch is attached.
>
> Maybe Kconfig should be modified as follows.
>
> # Default to 4 for wider testing, though 8 might be more appropriate.
> # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
> # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
> # XEN uses the mapping field on pagetable pages to store a pointer to
> # the destructor.
> #
> config SPLIT_PTLOCK_CPUS
> int
> default "4096" if ARM && !CPU_CACHE_VIPT
> default "4096" if PARISC && !PA20
> - default "4096" if XEN
> + default "4096" if X86_XEN || X86_64_XEN
> default "4"
>
>
>
> --
> yamahata
> # HG changeset patch
> # User yamahata@xxxxxxxxxxxxx
> # Node ID b3c4d485d1bda305bfd152da1c1521f6f5e0a7f3
> # Parent adb151aaf3f800e9a34b19aa94a93513a0a59e9f
> cleanup xen_mkbuilttree_pre.
> Actually only linux-2.6-xen-sparse/mm/Kconfig is needed to mv.
>
> PATCHNAME: cleanup_xen_mkbuilttree_pre
>
> diff -r adb151aaf3f8 -r b3c4d485d1bd
> linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
> --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Wed Apr 26
> 20:55:42 2006 -0600
> +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Tue May 2
> 21:01:43 2006 +0900
> @@ -14,28 +14,12 @@ function try_to_mv() {
> fi
> }
>
> -function try_to_mkdir() {
> - if [ ! -e $2 ]
> - then
> - mv $1 $2
> - mkdir $1
> - fi
> -}
> -
> -try_to_mkdir mm mm.xen-x86
> -try_to_mv net net.xen-x86
> -try_to_mv kernel kernel.xen-x86
> -try_to_mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
> -#try_to_mv arch/xen/kernel drivers/xen/core
> -#try_to_mkdir arch/xen arch/xen.xen-x86
> -#try_to_mv arch/xen.xen-x86/configs arch/xen
> -#try_to_mv include/asm-generic include/asm-generic.xen-x86
> -try_to_mkdir include/linux include/linux.xen-x86
> +try_to_mv mm/Kconfig mm/Kconfig.xen-x86
>
> # need to grab a couple of xen-modified files for generic_page_range and
> # typedef pte_fn_t which are used by driver/xen blkif
> -ln -sf ../mm.xen-x86/memory.c mm/
> -ln -sf ../linux.xen-x86/mm.h include/linux/
> +#ln -sf ../mm.xen-x86/memory.c mm/
> +#ln -sf ../linux.xen-x86/mm.h include/linux/
>
> #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
> ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h
> include/asm-ia64/xen/
> diff -r adb151aaf3f8 -r b3c4d485d1bd
> linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
> --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Wed Apr 26
> 20:55:42 2006 -0600
> +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Tue May 2
> 21:01:43 2006 +0900
> @@ -131,7 +131,6 @@ HYPERVISOR_poll(
> #define pte_mfn(_x) pte_pfn(_x)
> #define __pte_ma(_x) ((pte_t) {(_x)})
> #define phys_to_machine_mapping_valid(_x) (1)
> -#define kmap_flush_unused() do {} while (0)
> #define pfn_pte_ma(_x,_y) __pte_ma(0)
> #ifndef CONFIG_XEN_IA64_DOM0_VP //XXX
> #define set_phys_to_machine(_x,_y) do {} while (0)
> _______________________________________________
> Xen-ia64-devel mailing list
> Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-ia64-devel
--
yamahata
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
|
|
| |
|
Home