[packages/kernel] - x86_64 cleanup

arekm arekm at pld-linux.org
Fri May 31 20:09:06 CEST 2013


commit 0df4708835b85e51cfb843df62f74963ec7da163
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 31 20:09:02 2013 +0200

    - x86_64 cleanup

 kernel-multiarch.config | 68 ++++++++-----------------------------------------
 kernel-x86.config       | 11 +++++++-
 2 files changed, 20 insertions(+), 59 deletions(-)
---
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 97c9279..210a6a4 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1,31 +1,5 @@
 
 #-
-#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
-#-
-AMD_NUMA all=y
-BOOTPARAM_HOTPLUG_CPU0 all=n
-CPU_SUP_AMD all=y
-CPU_SUP_CENTAUR all=y
-CPU_SUP_INTEL all=y
-DEBUG_HOTPLUG_CPU0 all=n
-DEBUG_NMI_SELFTEST all=n
-DEBUG_SET_MODULE_RONX all=y
-DEBUG_STRICT_USER_COPY_CHECKS all=n
-DEBUG_TLBFLUSH all=n
-DMI all=y
-EFI_STUB all=y
-GART_IOMMU all=y
-KEYS_COMPAT all=y
-KVM_MMU_AUDIT all=y
-MICROCODE_INTEL_EARLY all=y
-OPTPROBES all=y
-PHYSICAL_START all=0x1000000
-PROCESSOR_SELECT all=y
-RAPIDIO all=y
-X86_INTEL_LPSS all=y
-X86_X2APIC all=y
-
-#-
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
@@ -135,7 +109,7 @@ CRYPTO_TGR192 all=m
 CRYPTO_WP512 all=m
 CRYPTO_GHASH_CLMUL_NI_INTEL all=m
 #- Ciphers
-CRYPTO_AES all=m
+CRYPTO_AES all=y
 CRYPTO_AES_586 i386=m
 CRYPTO_AES_X86_64 x86_64=m
 CRYPTO_AES_NI_INTEL all=m
@@ -170,7 +144,7 @@ CRYPTO_TWOFISH_AVX_X86_64 all=m
 #- Compression
 CRYPTO_DEFLATE all=m
 CRYPTO_ZLIB all=m
-CRYPTO_LZO all=m
+CRYPTO_LZO all=y
 #- Random Number Generation
 CRYPTO_ANSI_CPRNG all=m
 CRYPTO_USER_API_HASH all=m
@@ -220,10 +194,8 @@ ACPI_BLACKLIST_YEAR all=0
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=y
 X86_PM_TIMER x86=y
-ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=m
 ACPI_SBS x86=m
-ACPI_HED all=m
 ACPI_CUSTOM_METHOD all=m
 ACPI_BGRT all=y
 #- file drivers/acpi/apei/Kconfig goes here
@@ -640,7 +612,6 @@ PROC_EVENTS all=y
 #- *** FILE: drivers/cpufreq/Kconfig ***
 #-
 CPU_FREQ all=y
-CPU_FREQ_TABLE all=m ppc=y ppc64=y
 CPU_FREQ_STAT all=m
 CPU_FREQ_STAT_DETAILS all=y
 CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=n
@@ -648,7 +619,6 @@ CPU_FREQ_DEFAULT_GOV_POWERSAVE all=n
 CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
 CPU_FREQ_DEFAULT_GOV_ONDEMAND all=y
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
-CPU_FREQ_GOV_PERFORMANCE all=m
 CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=y
@@ -758,7 +728,6 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** FILE: drivers/extcon/Kconfig ***
 #-
-EXTCON all=m
 #- Extcon Device Drivers
 EXTCON_GPIO all=m
 EXTCON_ADC_JACK all=m
@@ -820,7 +789,6 @@ GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
-GPIO_SX150X all=m
 GPIO_STMPE all=y
 GPIO_TPS65912 all=m
 GPIO_TWL4030 powerpc=m
@@ -2740,7 +2708,7 @@ DVB_USB_TECHNISAT_USB2 all=m
 VIDEO_EM28XX all=m
 VIDEO_EM28XX_ALSA all=m sparc=n
 VIDEO_EM28XX_DVB all=m sparc=n
-VIDEO_EM28XX_RC all=y
+VIDEO_EM28XX_RC all=m
 
 #-
 #- *** FILE: drivers/media/usb/gspca/Kconfig ***
@@ -2973,7 +2941,6 @@ TPS6105X all=m
 TPS65010 all=m
 TPS6507X all=m
 MFD_TPS65217 all=m
-MFD_TPS6586X all=m
 MFD_TPS65912_SPI all=y
 TWL4030_CORE powerpc=y
 MFD_STMPE all=y
@@ -2984,7 +2951,6 @@ MFD_ARIZONA_I2C all=m
 MFD_ARIZONA_SPI all=m
 MFD_WM5102 all=y
 MFD_WM5110 all=y
-MFD_WM8400 all=m
 MFD_WM831X all=y
 MFD_WM831X_SPI all=y
 MFD_WM8350_I2C all=y
@@ -3048,7 +3014,6 @@ HMC6352 all=m
 DS1682 all=m
 TI_DAC7512 all=m
 VMWARE_BALLOON all=m
-BMP085 all=m
 BMP085_I2C all=m
 BMP085_SPI all=m
 PCH_PHUB all=m
@@ -3250,7 +3215,7 @@ MTD_DOCG3 all=m
 MTD_DOCPROBE all=m
 MTD_DOCECC all=m
 MTD_DOCPROBE_ADVANCED all=n
-MTD_DOCPROBE_ADDRESS all=0
+MTD_DOCPROBE_ADDRESS all=0x0
 
 #-
 #- *** FILE: drivers/mtd/lpddr/Kconfig ***
@@ -6122,7 +6087,7 @@ SERIAL_XILINX_PS_UART all=m
 SERIAL_ARC all=m
 SERIAL_ARC_NR_PORTS all=1
 SERIAL_RP2 all=m
-SERIAL_RP2_NR_UARTS all="32"
+SERIAL_RP2_NR_UARTS all=32
 
 #-
 #- *** FILE: drivers/uio/Kconfig ***
@@ -6288,7 +6253,6 @@ USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PCI ppc=y ppc64=y
 USB_OHCI_HCD_SSB all=y
 USB_OHCI_HCD_PLATFORM all=y
-USB_EHCI_HCD_PLATFORM all=y
 USB_OHCI_BIG_ENDIAN_DESC all=n ppc=y ppc64=y
 USB_OHCI_BIG_ENDIAN_MMIO all=n ppc=y ppc64=y
 USB_OHCI_LITTLE_ENDIAN all=y
@@ -6698,7 +6662,6 @@ VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 MDA_CONSOLE alpha=m i386=m
 DUMMY_CONSOLE all=y
 FRAMEBUFFER_CONSOLE all=y
-FRAMEBUFFER_CONSOLE_DETECT_PRIMARY all=n
 FRAMEBUFFER_CONSOLE_ROTATION all=y
 FONTS all=y alpha=n i386=n ia64=n x86_64=n
 FONT_8x8 all=y
@@ -6915,7 +6878,6 @@ FS_MBCACHE all=m
 #- file fs/btrfs/Kconfig goes here
 #- file fs/nilfs2/Kconfig goes here
 FS_POSIX_ACL all=y
-EXPORTFS all=m
 FILE_LOCKING all=y
 #- file fs/notify/Kconfig goes here
 #- file fs/quota/Kconfig goes here
@@ -7010,11 +6972,6 @@ AFS_DEBUG all=n
 AFS_FSCACHE all=y
 
 #-
-#- *** FILE: fs/aufs/Kconfig ***
-#-
-AUFS_PROC_MAP all=n
-
-#-
 #- *** FILE: fs/autofs4/Kconfig ***
 #-
 AUTOFS4_FS all=m
@@ -7263,10 +7220,10 @@ NCPFS_EXTRAS all=y
 #- *** FILE: fs/nfs/Kconfig ***
 #-
 NFS_FS all=m
-NFS_V2 all=y
-NFS_V3 all=y
+NFS_V2 all=m
+NFS_V3 all=m
 NFS_V3_ACL all=y
-NFS_V4 all=y
+NFS_V4 all=m
 NFS_SWAP all=y
 NFS_V4_1 all=n
 NFS_FSCACHE all=y
@@ -7512,7 +7469,6 @@ AUDIT_LOGINUID_IMMUTABLE all=n
 #- file kernel/time/Kconfig goes here
 TICK_CPU_ACCOUNTING all=n
 VIRT_CPU_ACCOUNTING_GEN all=n
-IRQ_TIME_ACCOUNTING all=y
 BSD_PROCESS_ACCT all=y
 BSD_PROCESS_ACCT_V3 all=y
 TASKSTATS all=y
@@ -7568,7 +7524,6 @@ SYSCTL all=y
 ANON_INODES all=y
 EXPERT all=n
 UID16 all=y
-SYSCTL_SYSCALL all=y
 KALLSYMS all=y
 KALLSYMS_ALL all=y
 HOTPLUG all=y
@@ -7769,7 +7724,6 @@ PROVE_LOCKING all=n
 LOCK_STAT all=n
 DEBUG_ATOMIC_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
-DEBUG_STACK_USAGE all=n
 DEBUG_KOBJECT all=n
 DEBUG_HIGHMEM i386=n sparc=n
 DEBUG_BUGVERBOSE all=y
@@ -7794,7 +7748,6 @@ KPROBES_SANITY_TEST all=n
 BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
 DEBUG_FORCE_WEAK_PER_CPU all=n
-DEBUG_PER_CPU_MAPS all=n
 LKDTM all=m
 NOTIFIER_ERROR_INJECTION all=m
 CPU_NOTIFIER_ERROR_INJECT all=m
@@ -8327,7 +8280,6 @@ LAPB all=m
 #- *** FILE: net/llc/Kconfig ***
 #-
 #* why LLC can't be `y' on sparc ?
-LLC all=y sparc=m
 LLC2 all=m
 
 #-
@@ -9176,7 +9128,7 @@ SND_SUN_DBRI sparc=m sparc64=m
 #-
 SND_SPI all=y
 SND_AT73C213 all=m
-SND_AT73C213_TARGET_BITRATE all="48000"
+SND_AT73C213_TARGET_BITRATE all=48000
 
 #-
 #- *** FILE: sound/usb/Kconfig ***
@@ -9261,7 +9213,6 @@ DRM_RADEON_KMS all=y
 DVB_CAPTURE_DRIVERS all=y
 DVB_FE_CUSTOMISE all=n
 E2100 alpha=m i386=m
-EARLY_PRINTK_MRST all=n
 EASYCAP all=m
 EASYCAP_DEBUG all=n
 EASYCAP_OSS all=n
@@ -9325,6 +9276,7 @@ IP6_NF_QUEUE all=m
 IP6_NF_TARGET_LOG all=m
 IP_NF_QUEUE all=m
 IP_NF_TARGET_LOG all=m
+IRQ_TIME_ACCOUN all=y
 ISERIES_VETH ppc64=n
 ISTALLION all=m
 IWLAGN all=m
diff --git a/kernel-x86.config b/kernel-x86.config
index 4ebdfcd..88f725a 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -16,6 +16,7 @@ OPTPROBES x86=y
 #- file init/Kconfig goes here
 #- file kernel/Kconfig.freezer goes here
 SMP x86=y
+X86_X2APIC all=y
 X86_MPPARSE x86=y
 X86_BIGSMP i386=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y
@@ -23,6 +24,7 @@ X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_WANT_INTEL_MID i486=n i586=n i686=n
+X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
@@ -68,6 +70,7 @@ X86_REBOOTFIXUPS i386=y
 MICROCODE x86=m
 MICROCODE_INTEL x86=y
 MICROCODE_AMD x86=y
+MICROCODE_INTEL_EARLY all=y
 X86_MSR x86=m
 X86_CPUID x86=m
 NOHIGHMEM i386=n
@@ -93,6 +96,7 @@ MTRR_SANITIZER_ENABLE_DEFAULT x86=0
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 EFI x86=y
+EFI_STUB all=y
 SECCOMP x86=y
 CC_STACKPROTECTOR x86=y x86_64=y
 #- file kernel/Kconfig.hz goes here
@@ -103,6 +107,8 @@ PHYSICAL_START x86=0x1000000
 RELOCATABLE i386=y x86_64=n
 PHYSICAL_ALIGN i386=0x100000
 HOTPLUG_CPU x86=y
+BOOTPARAM_HOTPLUG_CPU0 all=n
+DEBUG_HOTPLUG_CPU0 all=n
 COMPAT_VDSO x86=n
 CMDLINE_BOOL x86=n
 #- file kernel/power/Kconfig goes here
@@ -135,6 +141,7 @@ NET5501 i486=y i586=y i686=y
 GEOS i486=y i586=y i686=y
 #- file drivers/pcmcia/Kconfig goes here
 #- file drivers/pci/hotplug/Kconfig goes here
+RAPIDIO all=y
 #- file drivers/rapidio/Kconfig goes here
 #- file fs/Kconfig.binfmt goes here
 IA32_EMULATION x86_64=y
@@ -145,7 +152,6 @@ X86_X32 all=n
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
-#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -202,6 +208,7 @@ DEBUG_RODATA all=y
 DEBUG_RODATA_TEST all=n
 DEBUG_SET_MODULE_RONX all=y
 DEBUG_NX_TEST x86=m
+DEBUG_TLBFLUSH all=n
 IOMMU_DEBUG x86_64=n
 IOMMU_STRESS x86=n
 X86_DECODER_SELFTEST x86=n
@@ -213,6 +220,7 @@ DEBUG_BOOT_PARAMS x86=n
 CPA_DEBUG x86=n
 OPTIMIZE_INLINING x86=n
 DEBUG_STRICT_USER_COPY_CHECKS x86=n
+DEBUG_NMI_SELFTEST all=y
 
 #-
 #- *** FILE: arch/x86/kvm/Kconfig ***
@@ -333,6 +341,7 @@ USB_FUSB300 all=m
 IRQ_TIME_ACCOUNTING x86=n
 #- file usr/Kconfig goes here
 #- file arch/Kconfig goes here
+#- Do not forget to sign required modules with scripts/sign-file
 #- file block/Kconfig goes here
 #- file kernel/Kconfig.locks goes here
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/0df4708835b85e51cfb843df62f74963ec7da163



More information about the pld-cvs-commit mailing list