* Kernel: disable XEN, the NVIDIA driver doesn't like it.

* Remove the paravirt patch on >= 2.6.22, which does exactly the
  wrong thing.  What was I smoking?

svn path=/nixpkgs/trunk/; revision=10091
This commit is contained in:
Eelco Dolstra 2008-01-07 18:40:17 +00:00
parent 000226696b
commit 7f3bd3adcb
3 changed files with 1 additions and 21 deletions

View file

@ -1,14 +0,0 @@
diff -rc linux-2.6.22.1/arch/i386/kernel/paravirt.c linux-2.6.22.1-para/arch/i386/kernel/paravirt.c
*** linux-2.6.22.1/arch/i386/kernel/paravirt.c 2007-07-20 16:19:35.000000000 +0200
--- linux-2.6.22.1-para/arch/i386/kernel/paravirt.c 2007-07-20 16:20:00.000000000 +0200
***************
*** 344,347 ****
.activate_mm = paravirt_nop,
};
! EXPORT_SYMBOL(paravirt_ops);
--- 344,347 ----
.activate_mm = paravirt_nop,
};
! EXPORT_SYMBOL_GPL(paravirt_ops);

View file

@ -119,7 +119,7 @@ CONFIG_X86_PC=y
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_ES7000 is not set
CONFIG_PARAVIRT=y
CONFIG_XEN=y
# CONFIG_XEN is not set
CONFIG_VMI=y
# CONFIG_M386 is not set
# CONFIG_M486 is not set

View file

@ -3216,9 +3216,6 @@ rec {
"CONFIG_EXT3COW_FS_SECURITY=y\n";
}
*/
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
}
/*
{ name = "skas-2.6.20-v9-pre9";
patch = fetchurl {
@ -3285,9 +3282,6 @@ rec {
kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
}
{ # resume with resume=swap:/dev/xx
name = "tux on ice"; # (swsusp2)
patch = fetchurl {