diff --git a/PKGBUILD b/PKGBUILD
index 9ca8f9a..dd0a065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -453,7 +453,7 @@ case $_basever in
     sha256sums=('7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366'
             '8e192e06d4e4fd28f54f270e70602d95332e43864f7d4a3e0ecf4255ac0c2e6d'
             'SKIP'
-            '828d90d788ad44ba1480486081afb3ec730de5b48dfe344662043940a0b42cdf'
+            '0a7c40402715f8817c4f40173ca1fa8af84c56f7658be281e5424319000370b6'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
             '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
             'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
@@ -462,8 +462,8 @@ case $_basever in
             '5efd40c392ece498d2d43d5443e6537c2d9ef7cf9820d5ce80b6577fc5d1a4b2'
             '2b0a310f577261ed51b25307720bc57119a9d67bb531291997ba93507a98ede5'
             'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
-            'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
-            '742d12d2e2ab5b59245a897af6e7726b8d14ed39d5fd402faba23fa56382b87a'
+            '3cdc90f272465c2edb6bac8a3c90f2e098ba8ca73d27e4c0cadf70b7e87641ea'
+            'c8b0f2a1ef84b192c67b61c5a60426a640d5a83ac55a736929f0c4e6ec7b85f8'
             'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
             '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
             'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
diff --git a/linux-tkg-config/5.12/config.x86_64 b/linux-tkg-config/5.12/config.x86_64
index f4f5764..198fea5 100644
--- a/linux-tkg-config/5.12/config.x86_64
+++ b/linux-tkg-config/5.12/config.x86_64
@@ -451,6 +451,7 @@ CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=m
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
diff --git a/linux-tkg-patches/5.12/0004-5.12-ck1.patch b/linux-tkg-patches/5.12/0004-5.12-ck1.patch
index 6ec495c..f81ac54 100644
--- a/linux-tkg-patches/5.12/0004-5.12-ck1.patch
+++ b/linux-tkg-patches/5.12/0004-5.12-ck1.patch
@@ -941,697 +941,6 @@ index dfdc3e0af5e1..29d05f33c431 100644
  config NR_CPUS
  	int "Maximum number of CPUs (2-4096)"
  	range 2 4096
-diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig
-index 5c24ac7fdf56..8de540dbc54a 100644
---- a/arch/mips/configs/fuloong2e_defconfig
-+++ b/arch/mips/configs/fuloong2e_defconfig
-@@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
-diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig
-index 5cb91509bb7c..31497e931a55 100644
---- a/arch/mips/configs/gpr_defconfig
-+++ b/arch/mips/configs/gpr_defconfig
-@@ -1,8 +1,8 @@
-+CONFIG_PREEMPT=y
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_BSD_PROCESS_ACCT_V3=y
- CONFIG_RELAY=y
-diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
-index 21a1168ae301..529a1b1007cf 100644
---- a/arch/mips/configs/ip22_defconfig
-+++ b/arch/mips/configs/ip22_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_SYSVIPC=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
-diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig
-index 0921ef38e9fb..6da05cef46f8 100644
---- a/arch/mips/configs/ip28_defconfig
-+++ b/arch/mips/configs/ip28_defconfig
-@@ -1,5 +1,5 @@
- CONFIG_SYSVIPC=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
-diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
-index 8c223035921f..a3bf87450343 100644
---- a/arch/mips/configs/jazz_defconfig
-+++ b/arch/mips/configs/jazz_defconfig
-@@ -1,8 +1,8 @@
-+CONFIG_PREEMPT=y
- CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_LOG_BUF_SHIFT=14
- CONFIG_RELAY=y
-diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
-index 205d3b34528c..0bf59b3116d3 100644
---- a/arch/mips/configs/mtx1_defconfig
-+++ b/arch/mips/configs/mtx1_defconfig
-@@ -1,8 +1,8 @@
-+CONFIG_PREEMPT=y
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_AUDIT=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_BSD_PROCESS_ACCT_V3=y
- CONFIG_RELAY=y
-diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
-index bf9b9244929e..81af5e0e3518 100644
---- a/arch/mips/configs/nlm_xlr_defconfig
-+++ b/arch/mips/configs/nlm_xlr_defconfig
-@@ -1,10 +1,10 @@
-+CONFIG_PREEMPT=y
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_AUDIT=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_BSD_PROCESS_ACCT_V3=y
- CONFIG_TASKSTATS=y
-diff --git a/arch/mips/configs/pic32mzda_defconfig b/arch/mips/configs/pic32mzda_defconfig
-index 63fe2da1b37f..7f08ee237345 100644
---- a/arch/mips/configs/pic32mzda_defconfig
-+++ b/arch/mips/configs/pic32mzda_defconfig
-@@ -1,7 +1,7 @@
-+CONFIG_PREEMPT=y
- CONFIG_SYSVIPC=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
-diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig
-index b9adf15ebbec..0025b56dc300 100644
---- a/arch/mips/configs/pistachio_defconfig
-+++ b/arch/mips/configs/pistachio_defconfig
-@@ -1,9 +1,9 @@
-+CONFIG_PREEMPT=y
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_DEFAULT_HOSTNAME="localhost"
- CONFIG_SYSVIPC=y
- CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_IKCONFIG=m
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=18
-diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
-index 3dc2da2bee0d..fb6594366531 100644
---- a/arch/mips/configs/rm200_defconfig
-+++ b/arch/mips/configs/rm200_defconfig
-@@ -1,6 +1,6 @@
-+CONFIG_PREEMPT=y
- CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
--CONFIG_PREEMPT_VOLUNTARY=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
-diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig
-new file mode 100644
-index 000000000000..578524f80cc4
---- /dev/null
-+++ b/arch/parisc/configs/712_defconfig
-@@ -0,0 +1,181 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=16
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_SLAB=y
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+CONFIG_PA7100LC=y
-+CONFIG_PREEMPT=y
-+CONFIG_GSC_LASI=y
-+# CONFIG_PDC_CHASSIS is not set
-+CONFIG_BINFMT_MISC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=m
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_DIAG=m
-+# CONFIG_IPV6 is not set
-+CONFIG_NETFILTER=y
-+CONFIG_LLC2=m
-+CONFIG_NET_PKTGEN=m
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+# CONFIG_STANDALONE is not set
-+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-+CONFIG_PARPORT=y
-+CONFIG_PARPORT_PC=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=y
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_SIZE=6144
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_SCSI=y
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+CONFIG_BLK_DEV_SR=y
-+CONFIG_CHR_DEV_SG=y
-+CONFIG_SCSI_ISCSI_ATTRS=m
-+CONFIG_SCSI_LASI700=y
-+CONFIG_SCSI_DEBUG=m
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=m
-+CONFIG_MD_LINEAR=m
-+CONFIG_MD_RAID0=m
-+CONFIG_MD_RAID1=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_TUN=m
-+CONFIG_LASI_82596=y
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPPOE=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+# CONFIG_KEYBOARD_HIL_OLD is not set
-+CONFIG_MOUSE_SERIAL=m
-+CONFIG_LEGACY_PTY_COUNT=64
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=17
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_SERIAL_MUX is not set
-+CONFIG_PDC_CONSOLE=y
-+CONFIG_PRINTER=m
-+CONFIG_PPDEV=m
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_RAW_DRIVER=y
-+# CONFIG_HWMON is not set
-+CONFIG_FB=y
-+CONFIG_FB_MODE_HELPERS=y
-+CONFIG_FB_TILEBLITTING=y
-+CONFIG_DUMMY_CONSOLE_COLUMNS=128
-+CONFIG_DUMMY_CONSOLE_ROWS=48
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+# CONFIG_LOGO_LINUX_CLUT224 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=y
-+CONFIG_SND_SEQUENCER=y
-+CONFIG_SND_HARMONY=y
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT3_FS=y
-+CONFIG_JFS_FS=m
-+CONFIG_XFS_FS=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_PROC_KCORE=y
-+CONFIG_TMPFS=y
-+CONFIG_UFS_FS=m
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V4=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_NLS_UTF8=m
-+CONFIG_DEBUG_FS=y
-+CONFIG_MAGIC_SYSRQ=y
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_DEFLATE=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_FONTS=y
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
-new file mode 100644
-index 000000000000..d1bdfad94048
---- /dev/null
-+++ b/arch/parisc/configs/c3000_defconfig
-@@ -0,0 +1,151 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=16
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EXPERT=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_SLAB=y
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+CONFIG_PA8X00=y
-+CONFIG_PREEMPT=y
-+# CONFIG_GSC is not set
-+CONFIG_PCI=y
-+CONFIG_PCI_LBA=y
-+# CONFIG_PDC_CHASSIS is not set
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=m
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_INET_DIAG is not set
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_TUNNEL=m
-+CONFIG_NETFILTER=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+# CONFIG_STANDALONE is not set
-+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-+CONFIG_BLK_DEV_UMEM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_IDE=y
-+CONFIG_BLK_DEV_IDECD=y
-+CONFIG_BLK_DEV_NS87415=y
-+CONFIG_SCSI=y
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+CONFIG_BLK_DEV_SR=y
-+CONFIG_CHR_DEV_SG=y
-+CONFIG_SCSI_ISCSI_ATTRS=m
-+CONFIG_SCSI_SYM53C8XX_2=y
-+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-+CONFIG_SCSI_DEBUG=m
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_MULTIPATH=m
-+CONFIG_FUSION=y
-+CONFIG_FUSION_SPI=m
-+CONFIG_FUSION_CTL=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_TUN=m
-+CONFIG_ACENIC=m
-+CONFIG_TIGON3=m
-+CONFIG_NET_TULIP=y
-+CONFIG_DE2104X=m
-+CONFIG_TULIP=y
-+CONFIG_TULIP_MMIO=y
-+CONFIG_E100=m
-+CONFIG_E1000=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPPOE=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_MOUSE_PS2 is not set
-+CONFIG_SERIO=m
-+CONFIG_SERIO_LIBPS2=m
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=13
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_RAW_DRIVER=y
-+# CONFIG_HWMON is not set
-+CONFIG_FB=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+# CONFIG_LOGO_LINUX_CLUT224 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=y
-+CONFIG_SND_SEQUENCER=y
-+CONFIG_SND_AD1889=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_STORAGE=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT3_FS=y
-+CONFIG_XFS_FS=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_PROC_KCORE=y
-+CONFIG_TMPFS=y
-+CONFIG_NFS_FS=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=y
-+CONFIG_NFSD_V3=y
-+CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_UTF8=m
-+CONFIG_DEBUG_FS=y
-+CONFIG_HEADERS_INSTALL=y
-+CONFIG_HEADERS_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_MD5=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_DES=m
-+# CONFIG_CRYPTO_HW is not set
-diff --git a/arch/parisc/configs/defconfig b/arch/parisc/configs/defconfig
-new file mode 100644
-index 000000000000..0d976614934c
---- /dev/null
-+++ b/arch/parisc/configs/defconfig
-@@ -0,0 +1,206 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=16
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_SLAB=y
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_BLK_DEV_BSG is not set
-+CONFIG_PA7100LC=y
-+CONFIG_PREEMPT=y
-+CONFIG_IOMMU_CCIO=y
-+CONFIG_GSC_LASI=y
-+CONFIG_GSC_WAX=y
-+CONFIG_EISA=y
-+CONFIG_PCI=y
-+CONFIG_GSC_DINO=y
-+CONFIG_PCI_LBA=y
-+CONFIG_PCCARD=y
-+CONFIG_YENTA=y
-+CONFIG_PD6729=y
-+CONFIG_I82092=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=m
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_INET6_AH=y
-+CONFIG_INET6_ESP=y
-+CONFIG_INET6_IPCOMP=y
-+CONFIG_LLC2=m
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+# CONFIG_STANDALONE is not set
-+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-+CONFIG_PARPORT=y
-+CONFIG_PARPORT_PC=m
-+CONFIG_PARPORT_PC_PCMCIA=m
-+CONFIG_PARPORT_1284=y
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=y
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_SIZE=6144
-+CONFIG_IDE=y
-+CONFIG_BLK_DEV_IDECS=y
-+CONFIG_BLK_DEV_IDECD=y
-+CONFIG_BLK_DEV_GENERIC=y
-+CONFIG_BLK_DEV_NS87415=y
-+CONFIG_SCSI=y
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+CONFIG_BLK_DEV_SR=y
-+CONFIG_CHR_DEV_SG=y
-+CONFIG_SCSI_LASI700=y
-+CONFIG_SCSI_SYM53C8XX_2=y
-+CONFIG_SCSI_ZALON=y
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+CONFIG_MD_RAID10=y
-+CONFIG_BLK_DEV_DM=y
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_TUN=m
-+CONFIG_ACENIC=y
-+CONFIG_TIGON3=y
-+CONFIG_NET_TULIP=y
-+CONFIG_TULIP=y
-+CONFIG_LASI_82596=y
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPPOE=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+# CONFIG_KEYBOARD_HIL_OLD is not set
-+CONFIG_MOUSE_SERIAL=y
-+CONFIG_LEGACY_PTY_COUNT=64
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_CS=y
-+CONFIG_SERIAL_8250_NR_UARTS=17
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_PRINTER=m
-+CONFIG_PPDEV=m
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_HWMON is not set
-+CONFIG_FB=y
-+CONFIG_FB_MODE_HELPERS=y
-+CONFIG_FB_TILEBLITTING=y
-+CONFIG_DUMMY_CONSOLE_COLUMNS=128
-+CONFIG_DUMMY_CONSOLE_ROWS=48
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+# CONFIG_LOGO_LINUX_CLUT224 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=y
-+CONFIG_SND_DYNAMIC_MINORS=y
-+CONFIG_SND_SEQUENCER=y
-+CONFIG_SND_AD1889=y
-+CONFIG_SND_HARMONY=y
-+CONFIG_HID_GYRATION=y
-+CONFIG_HID_NTRIG=y
-+CONFIG_HID_PANTHERLORD=y
-+CONFIG_HID_PETALYNX=y
-+CONFIG_HID_SAMSUNG=y
-+CONFIG_HID_SUNPLUS=y
-+CONFIG_HID_TOPSEED=y
-+CONFIG_USB=y
-+CONFIG_USB_MON=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_UHCI_HCD=y
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT3_FS=y
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+CONFIG_VFAT_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_TMPFS=y
-+CONFIG_NFS_FS=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=y
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=y
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_NLS_UTF8=y
-+CONFIG_DEBUG_FS=y
-+CONFIG_HEADERS_INSTALL=y
-+CONFIG_HEADERS_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_KEYS=y
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_FONTS=y
 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
 index 386ae12d8523..b8b3cf88c1c9 100644
 --- a/arch/powerpc/Kconfig
@@ -1645,19 +954,6 @@ index 386ae12d8523..b8b3cf88c1c9 100644
  config PPC_DENORMALISATION
  	bool "PowerPC denormalisation exception handling"
  	depends on PPC_BOOK3S_64
-diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
-index 6677ac0da45a..39e9ae02cef2 100644
---- a/arch/powerpc/configs/ppc6xx_defconfig
-+++ b/arch/powerpc/configs/ppc6xx_defconfig
-@@ -72,7 +72,7 @@ CONFIG_QE_GPIO=y
- CONFIG_MCU_MPC8349EMITX=y
- CONFIG_HIGHMEM=y
- CONFIG_HZ_1000=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_BINFMT_MISC=y
- CONFIG_HIBERNATION=y
- CONFIG_PM_DEBUG=y
 diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
 index 369206489895..6161cf738f64 100644
 --- a/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1674,58 +970,6 @@ index 369206489895..6161cf738f64 100644
  /*
   * Frequency of the spu scheduler tick.  By default we do one SPU scheduler
   * tick for every 10 CPU scheduler ticks.
-diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
-index ee6d28ae08de..827e4693c5b2 100644
---- a/arch/sh/configs/se7712_defconfig
-+++ b/arch/sh/configs/se7712_defconfig
-@@ -21,7 +21,7 @@ CONFIG_FLATMEM_MANUAL=y
- CONFIG_SH_SOLUTION_ENGINE=y
- CONFIG_SH_PCLK_FREQ=66666666
- CONFIG_HEARTBEAT=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_CMDLINE_OVERWRITE=y
- CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
- CONFIG_NET=y
-diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
-index bad921bc10f8..e8f42bc0d370 100644
---- a/arch/sh/configs/se7721_defconfig
-+++ b/arch/sh/configs/se7721_defconfig
-@@ -21,7 +21,7 @@ CONFIG_FLATMEM_MANUAL=y
- CONFIG_SH_7721_SOLUTION_ENGINE=y
- CONFIG_SH_PCLK_FREQ=33333333
- CONFIG_HEARTBEAT=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_CMDLINE_OVERWRITE=y
- CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2"
- CONFIG_NET=y
-diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
-index ba887f1351be..4434e93b70bc 100644
---- a/arch/sh/configs/titan_defconfig
-+++ b/arch/sh/configs/titan_defconfig
-@@ -19,7 +19,7 @@ CONFIG_SH_TITAN=y
- CONFIG_SH_PCLK_FREQ=30000000
- CONFIG_SH_DMA=y
- CONFIG_SH_DMA_API=y
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_CMDLINE_OVERWRITE=y
- CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
- CONFIG_PCI=y
-diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
-index 12a4fb0bd52a..a9e782ac3788 100644
---- a/arch/sparc/configs/sparc64_defconfig
-+++ b/arch/sparc/configs/sparc64_defconfig
-@@ -21,7 +21,7 @@ CONFIG_NO_HZ=y
- CONFIG_HIGH_RES_TIMERS=y
- CONFIG_NUMA=y
- CONFIG_DEFAULT_MMAP_MIN_ADDR=8192
--CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_PREEMPT=y
- CONFIG_SUN_LDOMS=y
- CONFIG_PCI=y
- CONFIG_PCI_MSI=y
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
 index 2792879d398e..704d8bbc0fdd 100644
 --- a/arch/x86/Kconfig
@@ -1762,33 +1006,6 @@ index 2792879d398e..704d8bbc0fdd 100644
  config UP_LATE_INIT
  	def_bool y
  	depends on !SMP && X86_LOCAL_APIC
-diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
-index 9c9c4a888b1d..89b06d3cbd12 100644
---- a/arch/x86/configs/i386_defconfig
-+++ b/arch/x86/configs/i386_defconfig
-@@ -23,6 +23,8 @@ CONFIG_PROFILING=y
- CONFIG_SMP=y
- CONFIG_X86_GENERIC=y
- CONFIG_HPET_TIMER=y
-+CONFIG_SCHED_SMT=y
-+CONFIG_PREEMPT=y
- CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
- CONFIG_X86_REBOOTFIXUPS=y
- CONFIG_MICROCODE_AMD=y
-diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
-index b60bd2d86034..7bd44d1fb977 100644
---- a/arch/x86/configs/x86_64_defconfig
-+++ b/arch/x86/configs/x86_64_defconfig
-@@ -20,6 +20,9 @@ CONFIG_BLK_DEV_INITRD=y
- # CONFIG_COMPAT_BRK is not set
- CONFIG_PROFILING=y
- CONFIG_SMP=y
-+CONFIG_NR_CPUS=64
-+CONFIG_SCHED_SMT=y
-+CONFIG_PREEMPT=y
- CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
- CONFIG_MICROCODE_AMD=y
- CONFIG_X86_MSR=y
 diff --git a/drivers/accessibility/speakup/speakup_acntpc.c b/drivers/accessibility/speakup/speakup_acntpc.c
 index c1ec087dca13..b2d0d4266f62 100644
 --- a/drivers/accessibility/speakup/speakup_acntpc.c
@@ -1962,10 +1179,11 @@ index cc6a0bc6c005..ac5c170d76e8 100644
  	}
  	swim_select(base, RELAX);
  }
-@@ -372,6 +372,7 @@ static inline int swim_step(struct swim __iomem *base)
+@@ -372,6 +372,6 @@ static inline int swim_step(struct swim __iomem *base)
+ 	for (wait = 0; wait < HZ; wait++) {
  
  		set_current_state(TASK_INTERRUPTIBLE);
- 		schedule_timeout(1);
+-		schedule_timeout(1);
 +		schedule_min_hrtimeout();
  
  		swim_select(base, RELAX);
@@ -2000,45 +1218,14 @@ diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
 index 85de313ddec2..03dd537ac072 100644
 --- a/drivers/cpufreq/Kconfig
 +++ b/drivers/cpufreq/Kconfig
-@@ -39,13 +39,15 @@ choice
+@@ -39,6 +39,7 @@ choice
  	default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ
  	default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if ARM64 || ARM
  	default CPU_FREQ_DEFAULT_GOV_SCHEDUTIL if X86_INTEL_PSTATE && SMP
--	default CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 +	default CPU_FREQ_DEFAULT_GOV_ONDEMAND if !X86_INTEL_PSTATE
-+	default CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF
+ 	default CPU_FREQ_DEFAULT_GOV_PERFORMANCE
  	help
  	  This option sets which CPUFreq governor shall be loaded at
- 	  startup. If in doubt, use the default setting.
- 
--config CPU_FREQ_DEFAULT_GOV_PERFORMANCE
-+config CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF
- 	bool "performance"
-+	select CPU_FREQ_DEFAULT_GOV_PERFORMANCE
- 	select CPU_FREQ_GOV_PERFORMANCE
- 	help
- 	  Use the CPUFreq governor 'performance' as default. This sets
-@@ -189,6 +189,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
- config CPU_FREQ_GOV_SCHEDUTIL
- 	bool "'schedutil' cpufreq policy governor"
- 	depends on CPU_FREQ && SMP
-+	default y if (X86_INTEL_PSTATE && SMP)
- 	select CPU_FREQ_GOV_ATTR_SET
- 	select IRQ_WORK
- 	help
-diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
-index 92701a18bdd9..7f49f2402ffa 100644
---- a/drivers/cpufreq/Kconfig.x86
-+++ b/drivers/cpufreq/Kconfig.x86
-@@ -8,8 +8,6 @@ config X86_INTEL_PSTATE
- 	depends on X86
- 	select ACPI_PROCESSOR if ACPI
- 	select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO
--	select CPU_FREQ_GOV_PERFORMANCE
--	select CPU_FREQ_GOV_SCHEDUTIL if SMP
- 	help
- 	  This driver provides a P state for Intel core processors.
- 	  The driver implements an internal governor and will become
 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
 index 7400d617ae3c..b7f829b0ca11 100644
 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
@@ -3131,106 +2318,6 @@ index 000000000000..91688dae437b
 +	default 3 if RQ_MC_LLC
 +	default 4 if RQ_SMP
 +	default 5 if RQ_ALL
-diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
-index 38ef6d06888e..89ed751ac4e4 100644
---- a/kernel/Kconfig.hz
-+++ b/kernel/Kconfig.hz
-@@ -5,7 +5,8 @@
- 
- choice
- 	prompt "Timer frequency"
--	default HZ_250
-+	default HZ_100 if SCHED_MUQSS
-+	default HZ_250_NODEF if !SCHED_MUQSS
- 	help
- 	 Allows the configuration of the timer frequency. It is customary
- 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more
-@@ -20,11 +21,18 @@ choice
- 	config HZ_100
- 		bool "100 HZ"
- 	help
-+	  100 Hz is a suitable choice in combination with MuQSS which does
-+	  not rely on ticks for rescheduling interrupts, and is not Hz limited
-+	  for timeouts and sleeps from both the kernel and userspace.
-+	  This allows us to benefit from the lower overhead and higher
-+	  throughput of fewer timer ticks.
-+
-+	  Non-MuQSS kernels:
- 	  100 Hz is a typical choice for servers, SMP and NUMA systems
- 	  with lots of processors that may show reduced performance if
- 	  too many timer interrupts are occurring.
- 
--	config HZ_250
-+	config HZ_250_NODEF
- 		bool "250 HZ"
- 	help
- 	 250 Hz is a good compromise choice allowing server performance
-@@ -32,7 +40,10 @@ choice
- 	 on SMP and NUMA systems. If you are going to be using NTSC video
- 	 or multimedia, selected 300Hz instead.
- 
--	config HZ_300
-+	 250 Hz is the default choice for the mainline scheduler but not
-+	 advantageous in combination with MuQSS.
-+
-+	config HZ_300_NODEF
- 		bool "300 HZ"
- 	help
- 	 300 Hz is a good compromise choice allowing server performance
-@@ -40,7 +51,7 @@ choice
- 	 on SMP and NUMA systems and exactly dividing by both PAL and
- 	 NTSC frame rates for video and multimedia work.
- 
--	config HZ_1000
-+	config HZ_1000_NODEF
- 		bool "1000 HZ"
- 	help
- 	 1000 Hz is the preferred choice for desktop systems and other
-@@ -51,9 +62,9 @@ endchoice
- config HZ
- 	int
- 	default 100 if HZ_100
--	default 250 if HZ_250
--	default 300 if HZ_300
--	default 1000 if HZ_1000
-+	default 250 if HZ_250_NODEF
-+	default 300 if HZ_300_NODEF
-+	default 1000 if HZ_1000_NODEF
- 
- config SCHED_HRTICK
- 	def_bool HIGH_RES_TIMERS
-diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
-index 416017301660..2fd8836235f6 100644
---- a/kernel/Kconfig.preempt
-+++ b/kernel/Kconfig.preempt
-@@ -2,7 +2,7 @@
- 
- choice
- 	prompt "Preemption Model"
--	default PREEMPT_NONE
-+	default PREEMPT
- 
- config PREEMPT_NONE
- 	bool "No Forced Preemption (Server)"
-@@ -18,7 +18,7 @@ config PREEMPT_NONE
- 	  latencies.
- 
- config PREEMPT_VOLUNTARY
--	bool "Voluntary Kernel Preemption (Desktop)"
-+	bool "Voluntary Kernel Preemption (Nothing)"
- 	depends on !ARCH_NO_PREEMPT
- 	help
- 	  This option reduces the latency of the kernel by adding more
-@@ -33,7 +33,8 @@ config PREEMPT_VOLUNTARY
- 	  applications to run more 'smoothly' even when the system is
- 	  under load.
- 
--	  Select this if you are building a kernel for a desktop system.
-+	  Select this for no system in particular (choose Preemptible
-+	  instead on a desktop if you know what's good for you).
- 
- config PREEMPT
- 	bool "Preemptible Kernel (Low-Latency Desktop)"
 diff --git a/kernel/Makefile b/kernel/Makefile
 index 320f1f3941b7..e48b2bc762ca 100644
 --- a/kernel/Makefile
@@ -3280,59 +2367,6 @@ index 04029e35e69a..5ee0dc0b9175 100644
  	sig->nr_threads--;
  	__unhash_process(tsk, group_dead);
  	write_sequnlock(&sig->stats_lock);
-diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
-index d79ef2493a28..8aa20871e7d0 100644
---- a/kernel/irq/Kconfig
-+++ b/kernel/irq/Kconfig
-@@ -108,6 +108,23 @@ config GENERIC_IRQ_RESERVATION_MODE
- config IRQ_FORCED_THREADING
-        bool
- 
-+config FORCE_IRQ_THREADING
-+	bool "Make IRQ threading compulsory"
-+	depends on IRQ_FORCED_THREADING
-+	default n
-+	help
-+
-+	  Make IRQ threading mandatory for any IRQ handlers that support it
-+	  instead of being optional and requiring the threadirqs kernel
-+	  parameter. Instead they can be optionally disabled with the
-+	  nothreadirqs kernel parameter.
-+
-+	  Enabling this may make some architectures not boot with runqueue
-+	  sharing and MuQSS.
-+
-+	  Enable if you are building for a desktop or low latency system,
-+	  otherwise say N.
-+
- config SPARSE_IRQ
- 	bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ
- 	help
-diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 21ea370fccda..fc1d9117a4d2 100644
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
-@@ -25,9 +25,20 @@
- #include "internals.h"
- 
- #if defined(CONFIG_IRQ_FORCED_THREADING) && !defined(CONFIG_PREEMPT_RT)
-+#ifdef CONFIG_FORCE_IRQ_THREADING
-+__read_mostly bool force_irqthreads = true;
-+#else
- __read_mostly bool force_irqthreads;
-+#endif
- EXPORT_SYMBOL_GPL(force_irqthreads);
- 
-+static int __init setup_noforced_irqthreads(char *arg)
-+{
-+	force_irqthreads = false;
-+	return 0;
-+}
-+early_param("nothreadirqs", setup_noforced_irqthreads);
-+
- static int __init setup_forced_irqthreads(char *arg)
- {
- 	force_irqthreads = true;
 diff --git a/kernel/kthread.c b/kernel/kthread.c
 index 1578973c5740..24b3b39f4123 100644
 --- a/kernel/kthread.c
@@ -13285,36 +12319,6 @@ diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
 index 83e158d016ba..1823a28d10a8 100644
 --- a/kernel/time/Kconfig
 +++ b/kernel/time/Kconfig
-@@ -77,6 +77,9 @@ config NO_HZ_COMMON
- 	bool
- 	select TICK_ONESHOT
- 
-+config NO_HZ_FULL
-+	bool
-+
- choice
- 	prompt "Timer tick handling"
- 	default NO_HZ_IDLE if NO_HZ
-@@ -97,8 +100,9 @@ config NO_HZ_IDLE
- 
- 	  Most of the time you want to say Y here.
- 
--config NO_HZ_FULL
-+config NO_HZ_FULL_NODEF
- 	bool "Full dynticks system (tickless)"
-+	select NO_HZ_FULL
- 	# NO_HZ_COMMON dependency
- 	# We need at least one periodic CPU for timekeeping
- 	depends on SMP
-@@ -123,6 +127,8 @@ config NO_HZ_FULL
- 	 transitions: syscalls, exceptions and interrupts. Even when it's
- 	 dynamically off.
- 
-+	 Not recommended for desktops,laptops, or mobile devices.
-+
- 	 Say N.
- 
- endchoice
 @@ -132,7 +138,7 @@ config CONTEXT_TRACKING
  
  config CONTEXT_TRACKING_FORCE
diff --git a/linux-tkg-patches/5.12/0004-glitched-muqss.patch b/linux-tkg-patches/5.12/0004-glitched-muqss.patch
index 2c4837e..5e3a053 100644
--- a/linux-tkg-patches/5.12/0004-glitched-muqss.patch
+++ b/linux-tkg-patches/5.12/0004-glitched-muqss.patch
@@ -19,51 +19,6 @@ index 84a1d08d68551..57c3036a68952 100644
  
  /*
   * sched_yield_type - Choose what sort of yield sched_yield will perform.
-
-diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
-index 2a202a846757..1d9c7ed79b11 100644
---- a/kernel/Kconfig.hz
-+++ b/kernel/Kconfig.hz
-@@ -5,7 +5,7 @@
- choice
- 	prompt "Timer frequency"
- 	default HZ_100 if SCHED_MUQSS
--	default HZ_250_NODEF if !SCHED_MUQSS
-+	default HZ_500_NODEF if !SCHED_MUQSS
- 	help
- 	 Allows the configuration of the timer frequency. It is customary
- 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more
-@@ -50,6 +50,20 @@ choice
- 	 on SMP and NUMA systems and exactly dividing by both PAL and
- 	 NTSC frame rates for video and multimedia work.
- 
-+	config HZ_500_NODEF
-+		bool "500 HZ"
-+	help
-+	 500 Hz is a good timer frequency for desktops. Provides fast
-+	 interactivity with great smoothness without sacrificing too
-+	 much throughput.
-+
-+	config HZ_750_NODEF
-+		bool "750 HZ"
-+	help
-+	 750 Hz is a good timer frequency for desktops. Provides fast
-+	 interactivity with great smoothness without sacrificing too
-+	 much throughput.
-+
- 	config HZ_1000_NODEF
- 		bool "1000 HZ"
- 	help
-@@ -63,6 +70,8 @@ config HZ
- 	default 100 if HZ_100
- 	default 250 if HZ_250_NODEF
- 	default 300 if HZ_300_NODEF
-+	default 500 if HZ_500_NODEF
-+	default 750 if HZ_750_NODEF
- 	default 1000 if HZ_1000_NODEF
- 
- config SCHED_HRTICK
-
 diff --git a/Makefile b/Makefile
 index d4d36c61940b..4a9dfe471f1f 100644
 --- a/Makefile