Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of... 

Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanup and cpufeature from Ingo Molnar:
 "Just a single cleanup and and a commit that adds new CPU feature
  names"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, boot: Remove ancient, unconditionally #ifdef'd out dead code

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: Add the RDSEED and ADX features
parents 3d72b105 e5a7286b 30d5c454

arch/x86/boot/header.S

+0 −7
Original line number Diff line number Diff line
@@ -406,13 +406,6 @@ init_size: .long INIT_SIZE # kernel initialization size 


	.section ".entrytext", "ax"

start_of_setup:

#ifdef SAFE_RESET_DISK_CONTROLLER

# Reset the disk controller.

	movw	$0x0000, %ax		# Reset disk controller

	movb	$0x80, %dl		# All disks

	int	$0x13

#endif



# Force %es = %ds

	movw	%ds, %ax

	movw	%ax, %es

arch/x86/include/asm/cpufeature.h

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ 
#define X86_FEATURE_ERMS	(9*32+ 9) /* Enhanced REP MOVSB/STOSB */

#define X86_FEATURE_INVPCID	(9*32+10) /* Invalidate Processor Context ID */

#define X86_FEATURE_RTM		(9*32+11) /* Restricted Transactional Memory */

#define X86_FEATURE_RDSEED	(9*32+18) /* The RDSEED instruction */

#define X86_FEATURE_ADX		(9*32+19) /* The ADCX and ADOX instructions */



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)