1 files changed, 324 insertions, 0 deletions
diff --git a/main/linux-vserver/kernelconfig.x86.rej b/main/linux-vserver/kernelconfig.x86.rej
new file mode 100644
index 0000000000..da4f89a9dd
--- /dev/null
+++ b/main/linux-vserver/kernelconfig.x86.rej
@@ -0,0 +1,324 @@
+--- kernelconfig.x86_64
++++ kernelconfig.x86_64
+@@ -1,6 +1,6 @@
+ #
+ # Automatically generated file; DO NOT EDIT.
+-# Linux/x86_64 3.6.10-vs2.3.4.6 Kernel Configuration
++# Linux/x86_64 3.4.45-vs2.3.3.9 Kernel Configuration
+ #
+ CONFIG_64BIT=y
+ # CONFIG_X86_32 is not set
+@@ -9,6 +9,11 @@
+ CONFIG_INSTRUCTION_DECODER=y
+ CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
++CONFIG_GENERIC_CMOS_UPDATE=y
++CONFIG_CLOCKSOURCE_WATCHDOG=y
++CONFIG_GENERIC_CLOCKEVENTS=y
++CONFIG_ARCH_CLOCKSOURCE_DATA=y
++CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+ CONFIG_LOCKDEP_SUPPORT=y
+ CONFIG_STACKTRACE_SUPPORT=y
+ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+@@ -43,12 +50,11 @@
+ CONFIG_X86_64_SMP=y
+ CONFIG_X86_HT=y
+ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
++# CONFIG_KTIME_SCALAR is not set
+ CONFIG_ARCH_CPU_PROBE_RELEASE=y
+-CONFIG_ARCH_SUPPORTS_UPROBES=y
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+ CONFIG_HAVE_IRQ_WORK=y
+ CONFIG_IRQ_WORK=y
+-CONFIG_BUILDTIME_EXTABLE_SORT=y
+ 
+ #
+ # General setup
+@@ -91,25 +97,8 @@
+ CONFIG_GENERIC_IRQ_SHOW=y
+ CONFIG_GENERIC_PENDING_IRQ=y
+ CONFIG_GENERIC_IRQ_CHIP=y
+-CONFIG_IRQ_DOMAIN=y
+-# CONFIG_IRQ_DOMAIN_DEBUG is not set
+ CONFIG_IRQ_FORCED_THREADING=y
+ CONFIG_SPARSE_IRQ=y
+-CONFIG_CLOCKSOURCE_WATCHDOG=y
+-CONFIG_ARCH_CLOCKSOURCE_DATA=y
+-CONFIG_GENERIC_TIME_VSYSCALL=y
+-CONFIG_GENERIC_CLOCKEVENTS=y
+-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+-CONFIG_GENERIC_CMOS_UPDATE=y
+-
+-#
+-# Timers subsystem
+-#
+-CONFIG_TICK_ONESHOT=y
+-CONFIG_NO_HZ=y
+-CONFIG_HIGH_RES_TIMERS=y
+ 
+ #
+ # RCU Subsystem
+@@ -226,9 +217,7 @@
+ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+ CONFIG_HAVE_CMPXCHG_LOCAL=y
+ CONFIG_HAVE_CMPXCHG_DOUBLE=y
+-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+ 
+ #
+ # GCOV-based kernel profiling
+@@ -426,9 +420,7 @@
+ CONFIG_TRANSPARENT_HUGEPAGE=y
+ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+ # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+-CONFIG_CROSS_MEMORY_ATTACH=y
+ # CONFIG_CLEANCACHE is not set
+-# CONFIG_FRONTSWAP is not set
+ # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+ CONFIG_X86_RESERVE_LOW=64
+ CONFIG_MTRR=y
+@@ -604,7 +577,6 @@
+ CONFIG_SYSVIPC_COMPAT=y
+ CONFIG_KEYS_COMPAT=y
+ CONFIG_HAVE_TEXT_POKE_SMP=y
+-CONFIG_X86_DEV_DMA_OPS=y
+ CONFIG_NET=y
+ CONFIG_COMPAT_NETLINK_MESSAGES=y
+ 
+@@ -1097,6 +1064,7 @@
+ CONFIG_XPS=y
+ CONFIG_NETPRIO_CGROUP=m
+ CONFIG_BQL=y
++CONFIG_HAVE_BPF_JIT=y
+ CONFIG_BPF_JIT=y
+ 
+ #
+@@ -1106,69 +1074,13 @@
+ CONFIG_NET_TCPPROBE=m
+ # CONFIG_HAMRADIO is not set
+ # CONFIG_CAN is not set
+-CONFIG_IRDA=m
+-
+-#
+-# IrDA protocols
+-#
+-CONFIG_IRLAN=m
+-CONFIG_IRNET=m
+-CONFIG_IRCOMM=m
+-CONFIG_IRDA_ULTRA=y
+-
+-#
+-# IrDA options
+-#
+-CONFIG_IRDA_CACHE_LAST_LSAP=y
+-CONFIG_IRDA_FAST_RR=y
+-# CONFIG_IRDA_DEBUG is not set
+-
+-#
+-# Infrared-port device drivers
+-#
+-
+-#
+-# SIR device drivers
+-#
+-CONFIG_IRTTY_SIR=m
+-
+-#
+-# Dongle support
+-#
+-CONFIG_DONGLE=y
+-CONFIG_ESI_DONGLE=m
+-CONFIG_ACTISYS_DONGLE=m
+-CONFIG_TEKRAM_DONGLE=m
+-CONFIG_TOIM3232_DONGLE=m
+-CONFIG_LITELINK_DONGLE=m
+-CONFIG_MA600_DONGLE=m
+-CONFIG_GIRBIL_DONGLE=m
+-CONFIG_MCP2120_DONGLE=m
+-CONFIG_OLD_BELKIN_DONGLE=m
+-CONFIG_ACT200L_DONGLE=m
+-CONFIG_KINGSUN_DONGLE=m
+-CONFIG_KSDAZZLE_DONGLE=m
+-CONFIG_KS959_DONGLE=m
+-
+-#
+-# FIR device drivers
+-#
+-CONFIG_USB_IRDA=m
+-CONFIG_SIGMATEL_FIR=m
+-CONFIG_NSC_FIR=m
+-CONFIG_WINBOND_FIR=m
+-CONFIG_SMC_IRCC_FIR=m
+-CONFIG_ALI_FIR=m
+-CONFIG_VLSI_FIR=m
+-CONFIG_VIA_FIR=m
+-CONFIG_MCS_FIR=m
++# CONFIG_IRDA is not set
+ CONFIG_BT=m
+ CONFIG_BT_RFCOMM=m
+ CONFIG_BT_RFCOMM_TTY=y
+ CONFIG_BT_BNEP=m
+ CONFIG_BT_BNEP_MC_FILTER=y
+ CONFIG_BT_BNEP_PROTO_FILTER=y
+-CONFIG_BT_CMTP=m
+ CONFIG_BT_HIDP=m
+ 
+ #
+@@ -1239,7 +1145,6 @@
+ # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+ # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+ # CONFIG_NFC is not set
+-CONFIG_HAVE_BPF_JIT=y
+ 
+ #
+ # Device Drivers
+@@ -1655,7 +1559,6 @@
+ CONFIG_SCSI_SRP=m
+ # CONFIG_SCSI_BFA_FC is not set
+ CONFIG_SCSI_VIRTIO=m
+-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ CONFIG_SCSI_DH=m
+ CONFIG_SCSI_DH_RDAC=m
+ CONFIG_SCSI_DH_HP_SW=m
+@@ -2607,14 +2421,6 @@
+ CONFIG_NVRAM=m
+ CONFIG_R3964=m
+ CONFIG_APPLICOM=m
+-
+-#
+-# PCMCIA character devices
+-#
+-CONFIG_SYNCLINK_CS=m
+-CONFIG_CARDMAN_4000=m
+-CONFIG_CARDMAN_4040=m
+-CONFIG_IPWIRELESS=m
+ CONFIG_MWAVE=m
+ CONFIG_RAW_DRIVER=m
+ CONFIG_MAX_RAW_DEVS=256
+@@ -3778,7 +3047,6 @@
+ CONFIG_MMC_WBSD=m
+ CONFIG_MMC_TIFM_SD=m
+ # CONFIG_MMC_SPI is not set
+-CONFIG_MMC_SDRICOH_CS=m
+ CONFIG_MMC_CB710=m
+ CONFIG_MMC_VIA_SDMMC=m
+ CONFIG_MMC_VUB300=m
+@@ -4055,58 +3312,42 @@
+ # CONFIG_ANDROID is not set
+ # CONFIG_PHONE is not set
+ # CONFIG_USB_WPAN_HCD is not set
+-# CONFIG_IPACK_BUS is not set
+-CONFIG_WIMAX_GDM72XX=m
+-# CONFIG_WIMAX_GDM72XX_QOS is not set
+-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+-CONFIG_WIMAX_GDM72XX_USB=y
+-# CONFIG_WIMAX_GDM72XX_SDIO is not set
+-# CONFIG_CSR_WIFI is not set
+ CONFIG_X86_PLATFORM_DEVICES=y
+-CONFIG_ACER_WMI=m
+-CONFIG_ACERHDF=m
+-CONFIG_ASUS_LAPTOP=m
+-CONFIG_DELL_LAPTOP=m
++# CONFIG_ACER_WMI is not set
++# CONFIG_ACERHDF is not set
++# CONFIG_ASUS_LAPTOP is not set
++# CONFIG_DELL_LAPTOP is not set
+ CONFIG_DELL_WMI=m
+ CONFIG_DELL_WMI_AIO=m
+-CONFIG_FUJITSU_LAPTOP=m
+-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
++# CONFIG_FUJITSU_LAPTOP is not set
+ # CONFIG_FUJITSU_TABLET is not set
+-CONFIG_AMILO_RFKILL=m
+-CONFIG_HP_ACCEL=m
++# CONFIG_AMILO_RFKILL is not set
++# CONFIG_HP_ACCEL is not set
+ CONFIG_HP_WMI=m
+-CONFIG_MSI_LAPTOP=m
+-CONFIG_PANASONIC_LAPTOP=m
+-CONFIG_COMPAL_LAPTOP=m
+-CONFIG_SONY_LAPTOP=m
+-# CONFIG_SONYPI_COMPAT is not set
+-CONFIG_IDEAPAD_LAPTOP=m
+-CONFIG_THINKPAD_ACPI=m
+-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+-# CONFIG_THINKPAD_ACPI_DEBUG is not set
+-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+-CONFIG_THINKPAD_ACPI_VIDEO=y
+-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
++# CONFIG_MSI_LAPTOP is not set
++# CONFIG_PANASONIC_LAPTOP is not set
++# CONFIG_COMPAL_LAPTOP is not set
++# CONFIG_SONY_LAPTOP is not set
++# CONFIG_IDEAPAD_LAPTOP is not set
++# CONFIG_THINKPAD_ACPI is not set
+ CONFIG_SENSORS_HDAPS=m
+ CONFIG_INTEL_MENLOW=m
+-CONFIG_EEEPC_LAPTOP=m
++# CONFIG_EEEPC_LAPTOP is not set
+ CONFIG_ASUS_WMI=m
+-CONFIG_ASUS_NB_WMI=m
+-CONFIG_EEEPC_WMI=m
++# CONFIG_ASUS_NB_WMI is not set
++# CONFIG_EEEPC_WMI is not set
+ CONFIG_ACPI_WMI=m
+ CONFIG_MSI_WMI=m
+ # CONFIG_TOPSTAR_LAPTOP is not set
+-CONFIG_ACPI_TOSHIBA=m
+-CONFIG_TOSHIBA_BT_RFKILL=m
+-CONFIG_ACPI_CMPC=m
++# CONFIG_ACPI_TOSHIBA is not set
++# CONFIG_TOSHIBA_BT_RFKILL is not set
++# CONFIG_ACPI_CMPC is not set
+ # CONFIG_INTEL_IPS is not set
+ # CONFIG_IBM_RTL is not set
+-CONFIG_XO15_EBOOK=m
++# CONFIG_XO15_EBOOK is not set
+ # CONFIG_SAMSUNG_LAPTOP is not set
+ CONFIG_MXM_WMI=m
+-CONFIG_INTEL_OAKTRAIL=m
++# CONFIG_INTEL_OAKTRAIL is not set
+ # CONFIG_SAMSUNG_Q10 is not set
+ # CONFIG_APPLE_GMUX is not set
+ 
+@@ -4515,7 +3730,6 @@
+ # CONFIG_DEBUG_RODATA_TEST is not set
+ CONFIG_DEBUG_SET_MODULE_RONX=y
+ CONFIG_DEBUG_NX_TEST=m
+-# CONFIG_DEBUG_TLBFLUSH is not set
+ # CONFIG_IOMMU_DEBUG is not set
+ # CONFIG_IOMMU_STRESS is not set
+ CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+@@ -4687,13 +3898,11 @@
+ CONFIG_CRYPTO_SEED=m
+ CONFIG_CRYPTO_SERPENT=m
+ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+ CONFIG_CRYPTO_TEA=m
+ CONFIG_CRYPTO_TWOFISH=m
+ CONFIG_CRYPTO_TWOFISH_COMMON=m
+ CONFIG_CRYPTO_TWOFISH_X86_64=m
+ CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+ 
+ #
+ # Compression
+@@ -4719,13 +3928,11 @@
+ CONFIG_KVM_APIC_ARCHITECTURE=y
+ CONFIG_KVM_MMIO=y
+ CONFIG_KVM_ASYNC_PF=y
+-CONFIG_HAVE_KVM_MSI=y
+ CONFIG_VIRTUALIZATION=y
+ CONFIG_KVM=m
+ CONFIG_KVM_INTEL=m
+ CONFIG_KVM_AMD=m
+ CONFIG_VHOST_NET=m
+-CONFIG_TCM_VHOST=m
+ # CONFIG_BINARY_PRINTF is not set
+ 
+ #