Kernel updates from 1.0 repository.

This commit is contained in:
Jeffrey Townsend
2016-08-11 20:51:57 +00:00
parent 890ded00f3
commit 567621e662
3 changed files with 38 additions and 2 deletions

View File

@@ -1816,7 +1816,7 @@ CONFIG_SENSORS_ADM1021=y
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_ADT7411 is not set
# CONFIG_SENSORS_ADT7462 is not set
# CONFIG_SENSORS_ADT7470 is not set
CONFIG_SENSORS_ADT7470=y
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_K8TEMP is not set
@@ -1873,7 +1873,18 @@ CONFIG_SENSORS_MAX6620=y
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
CONFIG_PMBUS=y
CONFIG_SENSORS_PMBUS=y
# CONFIG_SENSORS_ADM1275 is not set
# CONFIG_SENSORS_LM25066 is not set
# CONFIG_SENSORS_LTC2978 is not set
# CONFIG_SENSORS_MAX16064 is not set
# CONFIG_SENSORS_MAX34440 is not set
# CONFIG_SENSORS_DNI_DPS460 is not set
# CONFIG_SENSORS_MAX8688 is not set
# CONFIG_SENSORS_UCD9000 is not set
# CONFIG_SENSORS_UCD9200 is not set
# CONFIG_SENSORS_ZL6100 is not set
# CONFIG_SENSORS_SHT15 is not set
# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SIS5595 is not set
@@ -2455,6 +2466,7 @@ CONFIG_X86_PLATFORM_DEVICES=y
# CONFIG_INTEL_IPS is not set
# CONFIG_IBM_RTL is not set
# CONFIG_XO15_EBOOK is not set
# CONFIG_SAMSUNG_Q10 is not set
CONFIG_X86_64_DELL_S6000_S1220_R0=y
#

View File

@@ -0,0 +1,23 @@
--- a/arch/x86/kernel/reboot.c 2016-06-01 13:19:53.102025910 -0700
+++ b/arch/x86/kernel/reboot.c 2016-06-01 13:21:04.250027454 -0700
@@ -672,13 +672,13 @@ static void native_machine_emergency_res
break;
case BOOT_CF9_COLD:
- cf9_cold = inb(0xcf9) & ~6;
- outb(cf9_cold|8, 0xcf9); /* Request cold reset */
- udelay(50);
- outb(cf9_cold|12, 0xcf9); /* Actually do the reset */
- udelay(50);
- reboot_type = BOOT_KBD;
- break;
+ cf9_cold = inb(0xcf9) & ~0xE;
+ outb(cf9_cold|2, 0xcf9); /* Request cold reset */
+ udelay(50);
+ outb(cf9_cold|0xE, 0xcf9); /* Actually do the reset */
+ udelay(50);
+ reboot_type = BOOT_KBD;
+ break;
}
}
}

View File

@@ -250,3 +250,4 @@ platform-accton-as5512_54x-device-drivers.patch
platform-accton-as7716_32x-device-drivers.patch
driver-broadcom-tigon3.patch
mgmt-port-init-config.patch
arch-intel-reboot-cf9-cold.patch