[PATCH] x86_64: Remove x86_apicid field (2942283e) · Commits · 戴 / test

arch/x86_64/kernel/setup.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -727,7 +727,7 @@ static void __init display_cacheinfo(struct cpuinfo_x86 *c)
		static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
		{
		#ifdef CONFIG_SMP
		int cpu = c->x86_apicid;
		int cpu = smp_processor_id();
		int node = 0;
		if (c->x86_num_cores == 1)
		return;
		@@ -929,7 +929,6 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c)
		c->x86_clflush_size = 64;
		c->x86_cache_alignment = c->x86_clflush_size;
		c->x86_num_cores = 1;
		c->x86_apicid = c == &boot_cpu_data ? 0 : c - cpu_data;
		c->extended_cpuid_level = 0;
		memset(&c->x86_capability, 0, sizeof c->x86_capability);

		@@ -958,7 +957,6 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c)
		}
		if (c->x86_capability[0] & (1<<19))
		c->x86_clflush_size = ((misc >> 8) & 0xff) * 8;
		c->x86_apicid = misc >> 24;
		} else {
		/* Have CPUID level 0 only - unheard of */
		c->x86 = 4;

+0 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ struct cpuinfo_x86 {
		int x86_tlbsize; /* number of 4K pages in DTLB/ITLB combined(in pages)*/
		__u8 x86_virt_bits, x86_phys_bits;
		__u8 x86_num_cores;
		__u8 x86_apicid;
		__u32 x86_power;
		__u32 extended_cpuid_level; /* Max extended CPUID function supported */
		unsigned long loops_per_jiffy;