x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Hiroshi Shimamoto (1):
x86: uaccess_64: fix return value in __copy_from_user()
Steve Conklin (1):
x86: quirk for reboot stalls on a Dell Optiplex 330
arch/x86/include/asm/uaccess_64.h | 2 +- arch/x86/kernel/reboot.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-)
arch/x86/include/asm/uaccess_64.h +1 -1
@@ -46,7 +46,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size)return ret;case 10 :__get_user_asm (*(u64 *)dst, (u64 __user *)src, - ret,"q" ,"" ,"=r" ,16 ); + ret,"q" ,"" ,"=r" ,10 );if (unlikely (ret))return ret; __get_user_asm(*(u16 *)(8 + (char *)dst),
arch/x86/kernel/reboot.c +9 -0
@@ -169,6 +169,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "0KW626"), }, }, + { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ + .callback = set_bios_reboot, + .ident = "Dell OptiPlex 330", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"OptiPlex 330" ), + DMI_MATCH(DMI_BOARD_NAME, "0KP561"), + }, + }, { /* Handle problems with rebooting on Dell 2400's */ .callback = set_bios_reboot, .ident = "Dell PowerEdge 2400",