hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: uaccess_64: fix return value in __copy_from_user()
  x86: quirk for reboot stalls on a Dell Optiplex 330
This commit is contained in:
Linus Torvalds 2008-11-20 13:09:32 -08:00
parent ed79b86d8a 20a4a236c7
commit 0260da162f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/uaccess_64.h
View File

@ -46,7 +46,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size)
return ret; return ret;
case 10: case 10:
__get_user_asm(*(u64 *)dst, (u64 __user *)src, __get_user_asm(*(u64 *)dst, (u64 __user *)src,
ret, "q", "", "=r", 16); ret, "q", "", "=r", 10);
if (unlikely(ret)) if (unlikely(ret))
return ret; return ret;
__get_user_asm(*(u16 *)(8 + (char *)dst), __get_user_asm(*(u16 *)(8 + (char *)dst),

9
arch/x86/kernel/reboot.c
View File

@ -169,6 +169,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "0KW626"), 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 */ { /* Handle problems with rebooting on Dell 2400's */
.callback = set_bios_reboot, .callback = set_bios_reboot,
.ident = "Dell PowerEdge 2400", .ident = "Dell PowerEdge 2400",