ia64/xen-unstable
changeset 4459:0ccbf878a1d1
bitkeeper revision 1.1236.1.210 (425176314hDjHPFI637R43Jh2A-Ajg)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
author | cl349@firebug.cl.cam.ac.uk |
---|---|
date | Mon Apr 04 17:15:29 2005 +0000 (2005-04-04) |
parents | 3a5bddf34b1c 5d6313245c94 |
children | d4f09dabc5df |
files | linux-2.6.11-xen-sparse/arch/xen/Kconfig linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig |
line diff
1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig Mon Apr 04 16:55:15 2005 +0000 1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig Mon Apr 04 17:15:29 2005 +0000 1.3 @@ -153,6 +153,10 @@ if X86 1.4 source "arch/xen/i386/Kconfig" 1.5 endif 1.6 1.7 +if X86_64 1.8 +source "arch/xen/x86_64/Kconfig" 1.9 +endif 1.10 + 1.11 menu "Executable file formats" 1.12 1.13 source "fs/Kconfig.binfmt"
2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig Mon Apr 04 16:55:15 2005 +0000 2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig Mon Apr 04 17:15:29 2005 +0000 2.3 @@ -8,31 +8,14 @@ 2.4 # 2.5 2.6 menu "X86_64 processor configuration" 2.7 - depends XEN_X86_64 2.8 2.9 config XENARCH 2.10 string 2.11 default x86_64 2.12 2.13 -config X86_64 2.14 - bool 2.15 - default y 2.16 - help 2.17 - Port to the x86-64 architecture. x86-64 is a 64-bit extension to the 2.18 - classical 32-bit x86 architecture. For details see 2.19 - <http://www.x86-64.org/>. 2.20 - 2.21 -config X86 2.22 - bool 2.23 - default y 2.24 - 2.25 config 64BIT 2.26 def_bool y 2.27 2.28 -#config X86 2.29 -# bool 2.30 -# default y 2.31 - 2.32 config MMU 2.33 bool 2.34 default y 2.35 @@ -105,10 +88,10 @@ choice 2.36 prompt "Processor family" 2.37 default MK8 2.38 2.39 -config MK8 2.40 - bool "AMD-Opteron/Athlon64" 2.41 - help 2.42 - Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. 2.43 +#config MK8 2.44 +# bool "AMD-Opteron/Athlon64" 2.45 +# help 2.46 +# Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. 2.47 2.48 config MPSC 2.49 bool "Intel x86-64"