tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 0260da16 ed79b86d

+10 -1
unified split
+1 -1
arch/x86/include/asm/uaccess_64.h
··· 46 46 return ret; 47 47 case 10: 48 48 __get_user_asm(*(u64 *)dst, (u64 __user *)src, 49 - ret, "q", "", "=r", 16); 49 + ret, "q", "", "=r", 10); 50 50 if (unlikely(ret)) 51 51 return ret; 52 52 __get_user_asm(*(u16 *)(8 + (char *)dst),
+9
arch/x86/kernel/reboot.c
··· 169 169 DMI_MATCH(DMI_BOARD_NAME, "0KW626"), 170 170 }, 171 171 }, 172 + { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ 173 + .callback = set_bios_reboot, 174 + .ident = "Dell OptiPlex 330", 175 + .matches = { 176 + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 177 + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"), 178 + DMI_MATCH(DMI_BOARD_NAME, "0KP561"), 179 + }, 180 + }, 172 181 { /* Handle problems with rebooting on Dell 2400's */ 173 182 .callback = set_bios_reboot, 174 183 .ident = "Dell PowerEdge 2400",