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

Commit 4a553e14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86/cpu and x86/cpufeature from Ingo Molnar:
 "One tiny cleanup, and prepare for SMAP (Supervisor Mode Access
  Prevention) support on x86"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Remove the useless branch in c_start()

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: Add feature bit for SMAP
parents 08815bc2 dec08a83 05194cfc

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ 
#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 */

#define X86_FEATURE_SMAP	(9*32+20) /* Supervisor Mode Access Prevention */



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

arch/x86/kernel/cpu/proc.c

+1 −4
Original line number Diff line number Diff line
@@ -140,9 +140,6 @@ static int show_cpuinfo(struct seq_file *m, void *v) 


static void *c_start(struct seq_file *m, loff_t *pos)

{

	if (*pos == 0)	/* just in case, cpu 0 is not the first */

		*pos = cpumask_first(cpu_online_mask);

	else

	*pos = cpumask_next(*pos - 1, cpu_online_mask);

	if ((*pos) < nr_cpu_ids)

		return &cpu_data(*pos);