Commit e52c8857 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: update defconfigs
  x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe
  x86: cpuid: correct return value on partial operations
  x86: msr: correct return value on partial operations
  x86: cpuid: propagate error from smp_call_function_single()
  x86: msr: propagate errors from smp_call_function_single()
  smp: have smp_call_function_single() detect invalid CPUs
parents 9c2bdac4 c1b362e3

arch/x86/configs/i386_defconfig

+176 −127
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.26-rc1

# Sun May  4 19:59:02 2008

# Linux kernel version: 2.6.27-rc4

# Mon Aug 25 15:04:00 2008

#

# CONFIG_64BIT is not set

CONFIG_X86_32=y

# CONFIG_X86_64 is not set

CONFIG_X86=y

CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig"

CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"

# CONFIG_GENERIC_LOCKBREAK is not set

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CMOS_UPDATE=y
@@ -53,6 +53,7 @@ CONFIG_X86_HT=y 
CONFIG_X86_BIOS_REBOOT=y

CONFIG_X86_TRAMPOLINE=y

CONFIG_KTIME_SCALAR=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# General setup
@@ -82,6 +83,7 @@ CONFIG_CGROUPS=y 
CONFIG_CGROUP_NS=y

# CONFIG_CGROUP_DEVICE is not set

CONFIG_CPUSETS=y

CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

# CONFIG_RT_GROUP_SCHED is not set
@@ -105,7 +107,6 @@ CONFIG_SYSCTL=y 
# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_PCSPKR_PLATFORM=y

# CONFIG_COMPAT_BRK is not set

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y
@@ -132,27 +134,35 @@ CONFIG_MARKERS=y 
# CONFIG_OPROFILE is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

CONFIG_KRETPROBES=y

CONFIG_HAVE_IOREMAP_PROT=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_ARCH_TRACEHOOK is not set

# CONFIG_HAVE_DMA_ATTRS is not set

CONFIG_USE_GENERIC_SMP_HELPERS=y

# CONFIG_HAVE_CLK is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_KMOD is not set

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_LSF is not set

CONFIG_BLK_DEV_BSG=y

# CONFIG_BLK_DEV_INTEGRITY is not set



#

# IO Schedulers
@@ -176,19 +186,17 @@ CONFIG_NO_HZ=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_SMP=y

CONFIG_X86_FIND_SMP_CONFIG=y

CONFIG_X86_MPPARSE=y

CONFIG_X86_PC=y

# CONFIG_X86_ELAN is not set

# CONFIG_X86_VOYAGER is not set

# CONFIG_X86_NUMAQ is not set

# CONFIG_X86_SUMMIT is not set

# CONFIG_X86_BIGSMP is not set

# CONFIG_X86_VISWS is not set

# CONFIG_X86_GENERICARCH is not set

# CONFIG_X86_ES7000 is not set

# CONFIG_X86_RDC321X is not set

# CONFIG_X86_VSMP is not set

# CONFIG_X86_RDC321X is not set

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

# CONFIG_PARAVIRT_GUEST is not set

# CONFIG_MEMTEST is not set

# CONFIG_M386 is not set

# CONFIG_M486 is not set

# CONFIG_M586 is not set
@@ -215,21 +223,19 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 
# CONFIG_MPSC is not set

CONFIG_MCORE2=y

# CONFIG_GENERIC_CPU is not set

# CONFIG_X86_GENERIC is not set

CONFIG_X86_GENERIC=y

CONFIG_X86_CPU=y

CONFIG_X86_CMPXCHG=y

CONFIG_X86_L1_CACHE_SHIFT=6

CONFIG_X86_L1_CACHE_SHIFT=7

CONFIG_X86_XADD=y

CONFIG_X86_WP_WORKS_OK=y

CONFIG_X86_INVLPG=y

CONFIG_X86_BSWAP=y

CONFIG_X86_POPAD_OK=y

CONFIG_X86_GOOD_APIC=y

CONFIG_X86_INTEL_USERCOPY=y

CONFIG_X86_USE_PPRO_CHECKSUM=y

CONFIG_X86_P6_NOP=y

CONFIG_X86_TSC=y

CONFIG_X86_MINIMUM_CPU_FAMILY=6

CONFIG_X86_MINIMUM_CPU_FAMILY=4

CONFIG_X86_DEBUGCTLMSR=y

CONFIG_HPET_TIMER=y

CONFIG_HPET_EMULATE_RTC=y
@@ -247,7 +253,7 @@ CONFIG_X86_IO_APIC=y 
CONFIG_VM86=y

# CONFIG_TOSHIBA is not set

# CONFIG_I8K is not set

# CONFIG_X86_REBOOTFIXUPS is not set

CONFIG_X86_REBOOTFIXUPS=y

# CONFIG_MICROCODE is not set

CONFIG_X86_MSR=y

CONFIG_X86_CPUID=y
@@ -256,32 +262,28 @@ CONFIG_HIGHMEM4G=y 
# CONFIG_HIGHMEM64G is not set

CONFIG_PAGE_OFFSET=0xC0000000

CONFIG_HIGHMEM=y

CONFIG_NEED_NODE_MEMMAP_SIZE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_SPARSEMEM_STATIC=y

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set



#

# Memory hotplug is currently incompatible with Software Suspend

#

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

# CONFIG_HIGHPTE is not set

CONFIG_HIGHPTE=y

# CONFIG_MATH_EMULATION is not set

CONFIG_MTRR=y

# CONFIG_X86_PAT is not set

# CONFIG_MTRR_SANITIZER is not set

CONFIG_X86_PAT=y

CONFIG_EFI=y

# CONFIG_IRQBALANCE is not set

CONFIG_SECCOMP=y
@@ -293,6 +295,7 @@ CONFIG_HZ=1000 
CONFIG_SCHED_HRTICK=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y

# CONFIG_KEXEC_JUMP is not set

CONFIG_PHYSICAL_START=0x1000000

CONFIG_RELOCATABLE=y

CONFIG_PHYSICAL_ALIGN=0x200000
@@ -312,6 +315,7 @@ CONFIG_PM_TRACE_RTC=y 
CONFIG_PM_SLEEP_SMP=y

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND=y

# CONFIG_PM_TEST_SUSPEND is not set

CONFIG_SUSPEND_FREEZER=y

CONFIG_HIBERNATION=y

CONFIG_PM_STD_PARTITION=""
@@ -337,6 +341,7 @@ CONFIG_ACPI_THERMAL=y 
CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_EC=y

# CONFIG_ACPI_PCI_SLOT is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_SYSTEM=y

CONFIG_X86_PM_TIMER=y
@@ -395,8 +400,8 @@ CONFIG_PCI=y 
# CONFIG_PCI_GOBIOS is not set

# CONFIG_PCI_GOMMCONFIG is not set

# CONFIG_PCI_GODIRECT is not set

CONFIG_PCI_GOANY=y

# CONFIG_PCI_GOOLPC is not set

CONFIG_PCI_GOANY=y

CONFIG_PCI_BIOS=y

CONFIG_PCI_DIRECT=y

CONFIG_PCI_MMCONFIG=y
@@ -448,10 +453,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_AOUT is not set

CONFIG_BINFMT_MISC=y



#

# Networking

#

CONFIG_NET=y



#
@@ -475,7 +476,10 @@ CONFIG_IP_FIB_HASH=y 
CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

# CONFIG_IP_PNP is not set

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

CONFIG_IP_MROUTE=y
@@ -618,7 +622,6 @@ CONFIG_NET_SCHED=y 
# CONFIG_NET_SCH_HTB is not set

# CONFIG_NET_SCH_HFSC is not set

# CONFIG_NET_SCH_PRIO is not set

# CONFIG_NET_SCH_RR is not set

# CONFIG_NET_SCH_RED is not set

# CONFIG_NET_SCH_SFQ is not set

# CONFIG_NET_SCH_TEQL is not set
@@ -680,28 +683,19 @@ CONFIG_FIB_RULES=y 
CONFIG_CFG80211=y

CONFIG_NL80211=y

CONFIG_WIRELESS_EXT=y

CONFIG_WIRELESS_EXT_SYSFS=y

CONFIG_MAC80211=y



#

# Rate control algorithm selection

#

CONFIG_MAC80211_RC_PID=y

CONFIG_MAC80211_RC_DEFAULT_PID=y

# CONFIG_MAC80211_RC_DEFAULT_NONE is not set



#

# Selecting 'y' for an algorithm will

#



#

# build the algorithm into mac80211.

#

CONFIG_MAC80211_RC_DEFAULT="pid"

CONFIG_MAC80211_RC_PID=y

# CONFIG_MAC80211_MESH is not set

CONFIG_MAC80211_LEDS=y

# CONFIG_MAC80211_DEBUGFS is not set

# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set

# CONFIG_MAC80211_DEBUG is not set

# CONFIG_MAC80211_DEBUG_MENU is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -717,6 +711,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y

CONFIG_FIRMWARE_IN_KERNEL=y

CONFIG_EXTRA_FIRMWARE=""

# CONFIG_DEBUG_DRIVER is not set

CONFIG_DEBUG_DEVRES=y

# CONFIG_SYS_HYPERVISOR is not set
@@ -749,6 +745,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 
# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_IBM_ASM is not set

# CONFIG_PHANTOM is not set
@@ -760,10 +757,12 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_FUJITSU_LAPTOP is not set

# CONFIG_TC1100_WMI is not set

# CONFIG_MSI_LAPTOP is not set

# CONFIG_COMPAL_LAPTOP is not set

# CONFIG_SONY_LAPTOP is not set

# CONFIG_THINKPAD_ACPI is not set

# CONFIG_INTEL_MENLOW is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -802,12 +801,13 @@ CONFIG_SCSI_WAIT_SCAN=m 
#

CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

CONFIG_SCSI_ISCSI_ATTRS=y

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set

# CONFIG_SCSI_SRP_ATTRS is not set

# CONFIG_SCSI_LOWLEVEL is not set

# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

# CONFIG_SCSI_DH is not set

CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_ATA_ACPI=y
@@ -842,7 +842,7 @@ CONFIG_PATA_AMD=y 
# CONFIG_PATA_CS5536 is not set

# CONFIG_PATA_CYPRESS is not set

# CONFIG_PATA_EFAR is not set

# CONFIG_ATA_GENERIC is not set

CONFIG_ATA_GENERIC=y

# CONFIG_PATA_HPT366 is not set

# CONFIG_PATA_HPT37X is not set

# CONFIG_PATA_HPT3X2N is not set
@@ -852,7 +852,7 @@ CONFIG_PATA_AMD=y 
# CONFIG_PATA_JMICRON is not set

# CONFIG_PATA_TRIFLEX is not set

# CONFIG_PATA_MARVELL is not set

# CONFIG_PATA_MPIIX is not set

CONFIG_PATA_MPIIX=y

CONFIG_PATA_OLDPIIX=y

# CONFIG_PATA_NETCELL is not set

# CONFIG_PATA_NINJA32 is not set
@@ -871,6 +871,7 @@ CONFIG_PATA_OLDPIIX=y 
# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_SCH=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_LINEAR is not set
@@ -894,13 +895,16 @@ CONFIG_DM_ZERO=y 
#

# IEEE 1394 (FireWire) support

#



#

# Enable only one of the two stacks, unless you know what you are doing

#

# CONFIG_FIREWIRE is not set

# CONFIG_IEEE1394 is not set

# CONFIG_I2O is not set

CONFIG_MACINTOSH_DRIVERS=y

CONFIG_MAC_EMUMOUSEBTN=y

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

# CONFIG_IFB is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set
@@ -910,7 +914,23 @@ CONFIG_NETDEVICES=y 
# CONFIG_VETH is not set

# CONFIG_NET_SB1000 is not set

# CONFIG_ARCNET is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_HAPPYMEAL is not set
@@ -943,10 +963,10 @@ CONFIG_FORCEDETH=y 
CONFIG_E100=y

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set

# CONFIG_NE2K_PCI is not set

CONFIG_NE2K_PCI=y

# CONFIG_8139CP is not set

CONFIG_8139TOO=y

CONFIG_8139TOO_PIO=y

# CONFIG_8139TOO_PIO is not set

# CONFIG_8139TOO_TUNE_TWISTER is not set

# CONFIG_8139TOO_8129 is not set

# CONFIG_8139_OLD_RX_RESET is not set
@@ -961,25 +981,24 @@ CONFIG_NETDEV_1000=y 
# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

CONFIG_E1000=y

# CONFIG_E1000_NAPI is not set

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000E is not set

# CONFIG_E1000E_ENABLED is not set

CONFIG_E1000E=y

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_R8169 is not set

CONFIG_R8169=y

# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

CONFIG_SKY2=y

# CONFIG_SKY2_DEBUG is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set

CONFIG_BNX2=y

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set
@@ -1019,13 +1038,14 @@ CONFIG_WLAN_80211=y 
# CONFIG_RTL8180 is not set

# CONFIG_RTL8187 is not set

# CONFIG_ADM8211 is not set

# CONFIG_MAC80211_HWSIM is not set

# CONFIG_P54_COMMON is not set

CONFIG_ATH5K=y

# CONFIG_ATH5K_DEBUG is not set

# CONFIG_IWLWIFI is not set

# CONFIG_ATH9K is not set

# CONFIG_IWLCORE is not set

# CONFIG_IWLWIFI_LEDS is not set

# CONFIG_IWL4965 is not set

# CONFIG_IWLAGN is not set

# CONFIG_IWL3945 is not set

# CONFIG_HOSTAP is not set

# CONFIG_B43 is not set
@@ -1105,6 +1125,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y 
# CONFIG_MOUSE_PS2_TOUCHKIT is not set

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_APPLETOUCH is not set

# CONFIG_MOUSE_BCM5974 is not set

# CONFIG_MOUSE_VSXXXAA is not set

CONFIG_INPUT_JOYSTICK=y

# CONFIG_JOYSTICK_ANALOG is not set
@@ -1139,12 +1160,14 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_INEXIO is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

# CONFIG_TOUCHSCREEN_UCB1400 is not set

# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set

CONFIG_INPUT_MISC=y

# CONFIG_INPUT_PCSPKR is not set

# CONFIG_INPUT_APANEL is not set
@@ -1173,6 +1196,7 @@ CONFIG_SERIO_LIBPS2=y 
# Character devices

#

CONFIG_VT=y

CONFIG_CONSOLE_TRANSLATIONS=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

CONFIG_VT_HW_CONSOLE_BINDING=y
@@ -1223,8 +1247,8 @@ CONFIG_UNIX98_PTYS=y 
# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM_INTEL is not set

# CONFIG_HW_RANDOM_AMD is not set

CONFIG_HW_RANDOM_INTEL=y

CONFIG_HW_RANDOM_AMD=y

CONFIG_HW_RANDOM_GEODE=y

CONFIG_HW_RANDOM_VIA=y

CONFIG_NVRAM=y
@@ -1245,7 +1269,6 @@ CONFIG_NVRAM=y 
# CONFIG_CS5535_GPIO is not set

# CONFIG_RAW_DRIVER is not set

CONFIG_HPET=y

# CONFIG_HPET_RTC_IRQ is not set

# CONFIG_HPET_MMAP is not set

# CONFIG_HANGCHECK_TIMER is not set

# CONFIG_TCG_TPM is not set
@@ -1254,43 +1277,64 @@ CONFIG_DEVPORT=y 
CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

# CONFIG_I2C_CHARDEV is not set

CONFIG_I2C_HELPER_AUTO=y



#

# I2C Hardware Bus support

#



#

# PC SMBus host controller drivers

#

# CONFIG_I2C_ALI1535 is not set

# CONFIG_I2C_ALI1563 is not set

# CONFIG_I2C_ALI15X3 is not set

# CONFIG_I2C_AMD756 is not set

# CONFIG_I2C_AMD8111 is not set

CONFIG_I2C_I801=y

# CONFIG_I2C_I810 is not set

# CONFIG_I2C_ISCH is not set

# CONFIG_I2C_PIIX4 is not set

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_SCx200_ACB is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set

# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_TINY_USB is not set

# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIAPRO is not set



#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set



#

# External I2C/SMBus adapter drivers

#

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_TINY_USB is not set



#

# Graphics adapter I2C/DDC channel drivers

#

# CONFIG_I2C_VOODOO3 is not set



#

# Other I2C/SMBus bus drivers

#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set

# CONFIG_SCx200_ACB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_AT24 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set
@@ -1299,6 +1343,8 @@ CONFIG_I2C_I801=y 
# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

# CONFIG_GPIOLIB is not set

# CONFIG_W1 is not set

CONFIG_POWER_SUPPLY=y

# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -1360,8 +1406,10 @@ CONFIG_SSB_POSSIBLE=y 
#

# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_MFD_TMIO is not set



#

# Multimedia devices
@@ -1372,6 +1420,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers
@@ -1418,7 +1467,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y 
# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

# CONFIG_FB_SYS_FOPS is not set

CONFIG_FB_DEFERRED_IO=y

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set
@@ -1463,6 +1511,7 @@ CONFIG_FB_EFI=y 
# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_ARK is not set

# CONFIG_FB_PM3 is not set

# CONFIG_FB_CARMINE is not set

# CONFIG_FB_GEODE is not set

# CONFIG_FB_VIRTUAL is not set

CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -1470,6 +1519,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y 
CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_CORGI is not set

# CONFIG_BACKLIGHT_PROGEAR is not set

# CONFIG_BACKLIGHT_MBP_NVIDIA is not set



#

# Display device support
@@ -1489,15 +1539,7 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_LOGO_LINUX_CLUT224=y



#

# Sound

#

CONFIG_SOUND=y



#

# Advanced Linux Sound Architecture

#

CONFIG_SND=y

CONFIG_SND_TIMER=y

CONFIG_SND_PCM=y
@@ -1515,20 +1557,14 @@ CONFIG_SND_VERBOSE_PROCFS=y 
# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_VMASTER=y



#

# Generic devices

#

CONFIG_SND_DRIVERS=y

# CONFIG_SND_PCSP is not set

# CONFIG_SND_DUMMY is not set

# CONFIG_SND_VIRMIDI is not set

# CONFIG_SND_MTPAV is not set

# CONFIG_SND_SERIAL_U16550 is not set

# CONFIG_SND_MPU401 is not set



#

# PCI devices

#

CONFIG_SND_PCI=y

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS300 is not set

# CONFIG_SND_ALS4000 is not set
@@ -1603,36 +1639,14 @@ CONFIG_SND_HDA_GENERIC=y 
# CONFIG_SND_VIRTUOSO is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_YMFPCI is not set



#

# USB devices

#

CONFIG_SND_USB=y

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_USX2Y is not set

# CONFIG_SND_USB_CAIAQ is not set



#

# PCMCIA devices

#

CONFIG_SND_PCMCIA=y

# CONFIG_SND_VXPOCKET is not set

# CONFIG_SND_PDAUDIOCF is not set



#

# System on Chip audio support

#

# CONFIG_SND_SOC is not set



#

# ALSA SoC audio for Freescale SOCs

#



#

# SoC Audio for the Texas Instruments OMAP

#



#

# Open Sound System

#

# CONFIG_SOUND_PRIME is not set

CONFIG_HID_SUPPORT=y

CONFIG_HID=y
@@ -1668,6 +1682,7 @@ CONFIG_USB_DEVICEFS=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG is not set

CONFIG_USB_MON=y



#

# USB Host Controller Drivers
@@ -1691,6 +1706,7 @@ CONFIG_USB_UHCI_HCD=y 
#

# CONFIG_USB_ACM is not set

CONFIG_USB_PRINTER=y

# CONFIG_USB_WDM is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1712,6 +1728,7 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_KARMA is not set

# CONFIG_USB_STORAGE_SIERRA is not set

# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

CONFIG_USB_LIBUSUAL=y
@@ -1720,7 +1737,6 @@ CONFIG_USB_LIBUSUAL=y 
#

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

CONFIG_USB_MON=y



#

# USB port drivers
@@ -1733,7 +1749,6 @@ CONFIG_USB_MON=y 
# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set
@@ -1750,6 +1765,7 @@ CONFIG_USB_MON=y 
# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set
@@ -1759,7 +1775,9 @@ CONFIG_LEDS_CLASS=y 
#

# LED drivers

#

# CONFIG_LEDS_PCA9532 is not set

# CONFIG_LEDS_CLEVO_MAIL is not set

# CONFIG_LEDS_PCA955X is not set



#

# LED Triggers
@@ -1805,6 +1823,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set



#

# SPI RTC drivers
@@ -1837,11 +1856,13 @@ CONFIG_DMADEVICES=y 
# Firmware Drivers

#

# CONFIG_EDD is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_EFI_VARS=y

# CONFIG_DELL_RBU is not set

# CONFIG_DCDBAS is not set

CONFIG_DMIID=y

# CONFIG_ISCSI_IBFT_FIND is not set

CONFIG_ISCSI_IBFT_FIND=y

CONFIG_ISCSI_IBFT=y



#

# File systems
@@ -1920,14 +1941,27 @@ CONFIG_HUGETLB_PAGE=y 
# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_OMFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

# CONFIG_NFS_FS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

# CONFIG_NFSD is not set

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_NFS_ACL_SUPPORT=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set
@@ -2001,9 +2035,9 @@ CONFIG_NLS_UTF8=y 
# Kernel hacking

#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

# CONFIG_PRINTK_TIME is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_PRINTK_TIME=y

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -2033,6 +2067,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y
@@ -2043,23 +2078,32 @@ CONFIG_FRAME_POINTER=y 
# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FTRACE=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

# CONFIG_FTRACE is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SYSPROF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

CONFIG_PROVIDE_OHCI1394_DMA_INIT=y

# CONFIG_SAMPLES is not set

# CONFIG_KGDB is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

# CONFIG_STRICT_DEVMEM is not set

CONFIG_X86_VERBOSE_BOOTUP=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_DEBUG_STACK_USAGE=y

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_DEBUG_PER_CPU_MAPS is not set

# CONFIG_X86_PTDUMP is not set

CONFIG_DEBUG_RODATA=y

# CONFIG_DEBUG_RODATA_TEST is not set

CONFIG_DEBUG_NX_TEST=m

# CONFIG_4KSTACKS is not set

CONFIG_X86_FIND_SMP_CONFIG=y

CONFIG_X86_MPPARSE=y

CONFIG_DOUBLEFAULT=y

# CONFIG_MMIOTRACE is not set

CONFIG_IO_DELAY_TYPE_0X80=0

CONFIG_IO_DELAY_TYPE_0XED=1

CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -2071,6 +2115,7 @@ CONFIG_IO_DELAY_0X80=y 
CONFIG_DEFAULT_IO_DELAY_TYPE=0

CONFIG_DEBUG_BOOT_PARAMS=y

# CONFIG_CPA_DEBUG is not set

# CONFIG_OPTIMIZE_INLINING is not set



#

# Security options
@@ -2080,7 +2125,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y 
CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

# CONFIG_SECURITY_NETWORK_XFRM is not set

CONFIG_SECURITY_CAPABILITIES=y

CONFIG_SECURITY_FILE_CAPABILITIES=y

# CONFIG_SECURITY_ROOTPLUG is not set

CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
@@ -2141,6 +2185,10 @@ CONFIG_CRYPTO_HMAC=y 
# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_RMD128 is not set

# CONFIG_CRYPTO_RMD160 is not set

# CONFIG_CRYPTO_RMD256 is not set

# CONFIG_CRYPTO_RMD320 is not set

CONFIG_CRYPTO_SHA1=y

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set
@@ -2151,7 +2199,7 @@ CONFIG_CRYPTO_SHA1=y 
# Ciphers

#

CONFIG_CRYPTO_AES=y

# CONFIG_CRYPTO_AES_586 is not set

CONFIG_CRYPTO_AES_586=y

# CONFIG_CRYPTO_ANUBIS is not set

CONFIG_CRYPTO_ARC4=y

# CONFIG_CRYPTO_BLOWFISH is not set
@@ -2193,6 +2241,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y 
CONFIG_GENERIC_FIND_NEXT_BIT=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC_T10DIF=y

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

arch/x86/configs/x86_64_defconfig

+158 −100

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/kernel/cpuid.c

+11 −4
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, 
	struct cpuid_regs cmd;

	int cpu = iminor(file->f_path.dentry->d_inode);

	u64 pos = *ppos;

	ssize_t bytes = 0;

	int err = 0;



	if (count % 16)

		return -EINVAL;	/* Invalid chunk size */
@@ -96,14 +98,19 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, 
	for (; count; count -= 16) {

		cmd.eax = pos;

		cmd.ecx = pos >> 32;

		smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);

		if (copy_to_user(tmp, &cmd, 16))

			return -EFAULT;

		err = smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);

		if (err)

			break;

		if (copy_to_user(tmp, &cmd, 16)) {

			err = -EFAULT;

			break;

		}

		tmp += 16;

		bytes += 16;

		*ppos = ++pos;

	}



	return tmp - buf;

	return bytes ? bytes : err;

}



static int cpuid_open(struct inode *inode, struct file *file)

arch/x86/kernel/msr.c

+26 −12
Original line number Diff line number Diff line
@@ -72,21 +72,28 @@ static ssize_t msr_read(struct file *file, char __user *buf, 
	u32 data[2];

	u32 reg = *ppos;

	int cpu = iminor(file->f_path.dentry->d_inode);

	int err;

	int err = 0;

	ssize_t bytes = 0;



	if (count % 8)

		return -EINVAL;	/* Invalid chunk size */



	for (; count; count -= 8) {

		err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]);

		if (err)

			return -EIO;

		if (copy_to_user(tmp, &data, 8))

			return -EFAULT;

		if (err) {

			if (err == -EFAULT) /* Fix idiotic error code */

				err = -EIO;

			break;

		}

		if (copy_to_user(tmp, &data, 8)) {

			err = -EFAULT;

			break;

		}

		tmp += 2;

		bytes += 8;

	}



	return ((char __user *)tmp) - buf;

	return bytes ? bytes : err;

}



static ssize_t msr_write(struct file *file, const char __user *buf,
@@ -96,21 +103,28 @@ static ssize_t msr_write(struct file *file, const char __user *buf, 
	u32 data[2];

	u32 reg = *ppos;

	int cpu = iminor(file->f_path.dentry->d_inode);

	int err;

	int err = 0;

	ssize_t bytes = 0;



	if (count % 8)

		return -EINVAL;	/* Invalid chunk size */



	for (; count; count -= 8) {

		if (copy_from_user(&data, tmp, 8))

			return -EFAULT;

		if (copy_from_user(&data, tmp, 8)) {

			err = -EFAULT;

			break;

		}

		err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]);

		if (err)

			return -EIO;

		if (err) {

			if (err == -EFAULT) /* Fix idiotic error code */

				err = -EIO;

			break;

		}

		tmp += 2;

		bytes += 8;

	}



	return ((char __user *)tmp) - buf;

	return bytes ? bytes : err;

}



static int msr_open(struct inode *inode, struct file *file)

arch/x86/lib/msr-on-cpu.c

+12 −10
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe) 


	rv.msr_no = msr_no;

	if (safe) {

		smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1);

		err = rv.err;

		err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu,

					       &rv, 1);

		err = err ? err : rv.err;

	} else {

		smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1);

		err = smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1);

	}

	*l = rv.l;

	*h = rv.h;
@@ -64,23 +65,24 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe) 
	rv.l = l;

	rv.h = h;

	if (safe) {

		smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1);

		err = rv.err;

		err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu,

					       &rv, 1);

		err = err ? err : rv.err;

	} else {

		smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1);

		err = smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1);

	}



	return err;

}



void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)

int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)

{

	_wrmsr_on_cpu(cpu, msr_no, l, h, 0);

	return _wrmsr_on_cpu(cpu, msr_no, l, h, 0);

}



void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)

int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)

{

	_rdmsr_on_cpu(cpu, msr_no, l, h, 0);

	return _rdmsr_on_cpu(cpu, msr_no, l, h, 0);

}



/* These "safe" variants are slower and should be used when the target MSR

CRA Git | Maintained and supported by SUSTech CRA and CCSE