src/patches/suse-2.6.27.31/patches.xen/xen3-fixup-kconfig

   1 Subject: Fix xen configuration.
   2 From: jbeulich@novell.com
   3 Patch-mainline: obsolete
   4
   5 --- sle11-2009-02-05.orig/arch/x86/Kconfig      2009-02-05 10:18:30.000000000 +0100
   6 +++ sle11-2009-02-05/arch/x86/Kconfig   2009-02-05 10:20:53.000000000 +0100
   7 @@ -140,6 +140,7 @@ config HAVE_CPUMASK_OF_CPU_MAP
   8  config ARCH_HIBERNATION_POSSIBLE
   9         def_bool y
  10         depends on !SMP || !X86_VOYAGER
  11 +       depends on !XEN
  12
  13  config ARCH_SUSPEND_POSSIBLE
  14         def_bool y
  15 @@ -198,7 +199,7 @@ config X86_HT
  16
  17  config X86_BIOS_REBOOT
  18         bool
  19 -       depends on !X86_VOYAGER
  20 +       depends on !X86_VOYAGER && !XEN
  21         default y
  22
  23  config X86_TRAMPOLINE
  24 @@ -993,7 +994,7 @@ config HIGHMEM
  25  config X86_PAE
  26         def_bool n
  27         prompt "PAE (Physical Address Extension) Support"
  28 -       depends on X86_32 && !HIGHMEM4G
  29 +       depends on X86_32 && (!HIGHMEM4G || X86_XEN)
  30         select RESOURCES_64BIT
  31         help
  32           PAE is required for NX support, and furthermore enables
  33 --- sle11-2009-02-05.orig/arch/x86/Kconfig.debug        2009-02-02 09:38:47.000000000 +0100
  34 +++ sle11-2009-02-05/arch/x86/Kconfig.debug     2009-02-02 09:40:56.000000000 +0100
  35 @@ -304,7 +304,7 @@ config OPTIMIZE_INLINING
  36
  37  config KDB
  38         bool "Built-in Kernel Debugger support"
  39 -       depends on DEBUG_KERNEL
  40 +       depends on DEBUG_KERNEL && !XEN
  41         select KALLSYMS
  42         select KALLSYMS_ALL
  43         help
  44 --- sle11-2009-02-05.orig/drivers/xen/Kconfig   2008-11-10 11:49:15.000000000 +0100
  45 +++ sle11-2009-02-05/drivers/xen/Kconfig        2008-12-05 08:43:56.000000000 +0100
  46 @@ -16,12 +16,14 @@ menu "XEN"
  47
  48  config XEN_PRIVILEGED_GUEST
  49         bool "Privileged Guest (domain 0)"
  50 -       select PCI_REASSIGN if PCI
  51         help
  52           Support for privileged operation (domain 0)
  53
  54  config XEN_UNPRIVILEGED_GUEST
  55         def_bool !XEN_PRIVILEGED_GUEST
  56 +       select PM
  57 +       select PM_SLEEP
  58 +       select PM_SLEEP_SMP if SMP
  59
  60  config XEN_PRIVCMD
  61         def_bool y
  62 @@ -99,8 +101,9 @@ config XEN_NETDEV_LOOPBACK
  63
  64  config XEN_PCIDEV_BACKEND
  65         tristate "PCI-device backend driver"
  66 -       depends on PCI && XEN_BACKEND
  67 +       depends on PCI && XEN_PRIVILEGED_GUEST && XEN_BACKEND
  68         default XEN_BACKEND
  69 +       select PCI_REASSIGN
  70         help
  71           The PCI device backend driver allows the kernel to export arbitrary
  72           PCI devices to other guests. If you select this to be a module, you
  73 @@ -110,8 +113,8 @@ config XEN_PCIDEV_BACKEND
  74  choice
  75         prompt "PCI Backend Mode"
  76         depends on XEN_PCIDEV_BACKEND
  77 -       default XEN_PCIDEV_BACKEND_VPCI if !IA64
  78         default XEN_PCIDEV_BACKEND_CONTROLLER if IA64
  79 +       default XEN_PCIDEV_BACKEND_VPCI
  80
  81  config XEN_PCIDEV_BACKEND_VPCI
  82         bool "Virtual PCI"