From 7f3bd3adcb5d966c367db492c70e5fc0312bc3d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Jan 2008 18:40:17 +0000 Subject: [PATCH] * 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 --- .../linux/kernel/2.6.22-paravirt-nvidia.patch | 14 -------------- .../linux/kernel/config-2.6.23-i686-smp | 2 +- pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6ef883b865..29aa12cb775 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {