D11666.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11666.diff
View Options

	Index: head/sys/amd64/amd64/pmap.c
	===================================================================
	--- head/sys/amd64/amd64/pmap.c
	+++ head/sys/amd64/amd64/pmap.c
	@@ -274,8 +274,6 @@
	return (mask);
	}

	-extern struct pcpu __pcpu[];
	-
	#if !defined(DIAGNOSTIC)
	#ifdef __GNUC_GNU_INLINE__
	#define PMAP_INLINE __attribute__((__gnu_inline__)) inline
	@@ -1063,8 +1061,8 @@
	kernel_pmap->pm_pcids[i].pm_pcid = PMAP_PCID_KERN;
	kernel_pmap->pm_pcids[i].pm_gen = 1;
	}
	- __pcpu[0].pc_pcid_next = PMAP_PCID_KERN + 1;
	- __pcpu[0].pc_pcid_gen = 1;
	+ PCPU_SET(pcid_next, PMAP_PCID_KERN + 1);
	+ PCPU_SET(pcid_gen, 1);
	/*
	* pcpu area for APs is zeroed during AP startup.
	* pc_pcid_next and pc_pcid_gen are initialized by AP
	Index: head/sys/x86/x86/mp_x86.c
	===================================================================
	--- head/sys/x86/x86/mp_x86.c
	+++ head/sys/x86/x86/mp_x86.c
	@@ -90,8 +90,6 @@
	int mp_naps; /* # of Applications processors */
	int boot_cpu_id = -1; /* designated BSP */

	-extern struct pcpu __pcpu[];
	-
	/* AP uses this during bootstrap. Do not staticize. */
	char *bootSTK;
	int bootAP;