- removed uksm, patch btoken and upstream site not accessible for months

diff --git a/kernel-uksm.config b/kernel-uksm.config
deleted file mode 100644 (file)
index 3422c9d..0000000
--- a/kernel-uksm.config
+++ /dev/null
@@ -1,2 +0,0 @@
-UKSM all=y
-KSM_LEGACY all=n

diff --git a/kernel.spec b/kernel.spec
index a7dbecef957b71887a1e2d3dda4fd2a81f26c3af..5bb46c0fdef33dbd16410e11a1cb93339c48b218 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,7 +25,6 @@
 %bcond_with    fbcondecor      # build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
 %bcond_without pae             # build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with    nfsroot         # build with root on NFS support
-%bcond_with    uksm            # build with UKSM patch, http://kerneldedup.org/projects/uksm/
 
 %bcond_without imq             # imq support
 %bcond_without esfq            # esfq support
@@ -144,7 +143,6 @@ Source41:   kernel-patches.config
 Source43:      kernel-vserver.config
 
 Source55:      kernel-imq.config
-Source56:      kernel-uksm.config
 
 Source58:      kernel-inittmpfs.config
 
@@ -210,11 +208,6 @@ Patch101:  kernel-vserver-fixes.patch
 Patch145:      kernel-aufs4.patch
 Patch146:      kernel-aufs4+vserver.patch
 
-%define uksm_major_version 0.1.2.3
-%define uksm_version %{uksm_major_version}-for-v3.18
-Patch150:      http://kerneldedup.org/download/uksm/%{uksm_major_version}/uksm-%{uksm_version}.patch
-# Patch150-md5:        b6a2b2aae9c2844d0c74690632d7019e
-
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:      kernel-fix_256colors_menuconfig.patch
 
@@ -708,11 +701,6 @@ cd linux-%{basever}
 %patch146 -p1
 %endif
 
-# UKSM
-%if %{with uksm}
-%patch150 -p1
-%endif
-
 %if %{with rescuecd}
 %patch7000 -p1
 %endif
@@ -921,9 +909,6 @@ EOCONFIG
 %if %{with imq}
                %{SOURCE55} \
 %endif
-%if %{with uksm}
-               %{SOURCE56} \
-%endif
 %if %{with vserver}
                %{SOURCE43} \
 %endif