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

Commit cd4d09ec authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Carve out X86_FEATURE_* 



Move them to a separate header and have the following
dependency:

  x86/cpufeatures.h <- x86/processor.h <- x86/cpufeature.h

This makes it easier to use the header in asm code and not
include the whole cpufeature.h and add guards for asm.

Suggested-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1453842730-28463-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 78726ee5

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -666,7 +666,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 




	clearcpuid=BITNUM [X86]

	clearcpuid=BITNUM [X86]

			Disable CPUID feature X for the kernel. See

			Disable CPUID feature X for the kernel. See

			arch/x86/include/asm/cpufeature.h for the valid bit

			arch/x86/include/asm/cpufeatures.h for the valid bit

			numbers. Note the Linux specific bits are not necessarily

			numbers. Note the Linux specific bits are not necessarily

			stable over kernel options, but the vendor specific

			stable over kernel options, but the vendor specific

			ones should be.

			ones should be.

arch/x86/boot/cpuflags.h

+1 −1
Original line number Original line Diff line number Diff line 
#ifndef BOOT_CPUFLAGS_H

#ifndef BOOT_CPUFLAGS_H

#define BOOT_CPUFLAGS_H

#define BOOT_CPUFLAGS_H





#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/processor-flags.h>

#include <asm/processor-flags.h>





struct cpu_features {

struct cpu_features {

arch/x86/boot/mkcpustr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 




#include "../include/asm/required-features.h"

#include "../include/asm/required-features.h"

#include "../include/asm/disabled-features.h"

#include "../include/asm/disabled-features.h"

#include "../include/asm/cpufeature.h"

#include "../include/asm/cpufeatures.h"

#include "../kernel/cpu/capflags.c"

#include "../kernel/cpu/capflags.c"





int main(void)

int main(void)

arch/x86/crypto/crc32-pclmul_glue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/crc32.h>

#include <linux/crc32.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/hash.h>





#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/api.h>

#include <asm/fpu/api.h>

arch/x86/crypto/crc32c-intel_glue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/hash.h>





#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/internal.h>

#include <asm/fpu/internal.h>