tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86/cpu' into x86/urgent
Merge the forgotten cleanup patch for the new file, so the mess does not
propagate further.
+15
-16
+15
-16
arch/x86/include/asm/cpu_device_id.h
+15
-16
arch/x86/include/asm/cpu_device_id.h
···
1
1
/* SPDX-License-Identifier: GPL-2.0 */
2
-
#ifndef _CPU_DEVICE_ID
3
-
#define _CPU_DEVICE_ID 1
2
+
#ifndef _ASM_X86_CPU_DEVICE_ID
3
+
#define _ASM_X86_CPU_DEVICE_ID
4
4
5
5
/*
6
6
* Declare drivers belonging to specific x86 CPUs
···
8
8
*/
9
9
10
10
#include <linux/mod_devicetable.h>
11
-
12
-
extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
13
11
14
12
/*
15
13
* Match specific microcode revisions.
···
20
22
*/
21
23
22
24
struct x86_cpu_desc {
23
-
__u8 x86_family;
24
-
__u8 x86_vendor;
25
-
__u8 x86_model;
26
-
__u8 x86_stepping;
27
-
__u32 x86_microcode_rev;
25
+
u8 x86_family;
26
+
u8 x86_vendor;
27
+
u8 x86_model;
28
+
u8 x86_stepping;
29
+
u32 x86_microcode_rev;
28
30
};
29
31
30
-
#define INTEL_CPU_DESC(mod, step, rev) { \
31
-
.x86_family = 6, \
32
-
.x86_vendor = X86_VENDOR_INTEL, \
33
-
.x86_model = mod, \
34
-
.x86_stepping = step, \
35
-
.x86_microcode_rev = rev, \
32
+
#define INTEL_CPU_DESC(model, stepping, revision) { \
33
+
.x86_family = 6, \
34
+
.x86_vendor = X86_VENDOR_INTEL, \
35
+
.x86_model = (model), \
36
+
.x86_stepping = (stepping), \
37
+
.x86_microcode_rev = (revision), \
36
38
}
37
39
40
+
extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
38
41
extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
39
42
40
-
#endif
43
+
#endif /* _ASM_X86_CPU_DEVICE_ID */