diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-07 18:40:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-07 18:40:17 +0000 |
| commit | 7f3bd3adcb5d966c367db492c70e5fc0312bc3d0 (patch) | |
| tree | ea5744c5d08c06dbb8d8dab4514133713539e784 /pkgs/os-specific/linux/kernel | |
| parent | 000226696b6a978658a66bc83ec3b67dabb9fdab (diff) | |
| download | nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar.gz nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar.bz2 nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar.lz nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar.xz nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.tar.zst nixpkgs-7f3bd3adcb5d966c367db492c70e5fc0312bc3d0.zip | |
* 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
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/config-2.6.23-i686-smp | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch b/pkgs/os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch deleted file mode 100644 index 15dc34680d0..00000000000 --- a/pkgs/os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch +++ /dev/null @@ -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); diff --git a/pkgs/os-specific/linux/kernel/config-2.6.23-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.23-i686-smp index 5e472930410..86fbe30c521 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.23-i686-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.23-i686-smp @@ -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 |