Remove some leftovers from the CMAP* stuff in globaldata and the
BSP and AP startup.
This commit is contained in:
parent
d87ad35b4a
commit
aa0b4c590f
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -90,14 +90,9 @@ struct privatespace {
|
||||
struct globaldata globaldata;
|
||||
char __filler0[PAGE_SIZE - sizeof(struct globaldata)];
|
||||
|
||||
/* page 1..4 - CPAGE1,CPAGE2,CPAGE3,PPAGE1 */
|
||||
char CPAGE1[PAGE_SIZE];
|
||||
char CPAGE2[PAGE_SIZE];
|
||||
char CPAGE3[PAGE_SIZE];
|
||||
char PPAGE1[PAGE_SIZE];
|
||||
|
||||
/* page 5..4+UPAGES - idle stack (UPAGES pages) */
|
||||
/* page 1 - idle stack (UPAGES pages) */
|
||||
char idlestack[UPAGES * PAGE_SIZE];
|
||||
/* page 1+UPAGES... */
|
||||
};
|
||||
|
||||
extern struct privatespace SMP_prvspace[];
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -90,14 +90,9 @@ struct privatespace {
|
||||
struct globaldata globaldata;
|
||||
char __filler0[PAGE_SIZE - sizeof(struct globaldata)];
|
||||
|
||||
/* page 1..4 - CPAGE1,CPAGE2,CPAGE3,PPAGE1 */
|
||||
char CPAGE1[PAGE_SIZE];
|
||||
char CPAGE2[PAGE_SIZE];
|
||||
char CPAGE3[PAGE_SIZE];
|
||||
char PPAGE1[PAGE_SIZE];
|
||||
|
||||
/* page 5..4+UPAGES - idle stack (UPAGES pages) */
|
||||
/* page 1 - idle stack (UPAGES pages) */
|
||||
char idlestack[UPAGES * PAGE_SIZE];
|
||||
/* page 1+UPAGES... */
|
||||
};
|
||||
|
||||
extern struct privatespace SMP_prvspace[];
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
@ -90,14 +90,9 @@ struct privatespace {
|
||||
struct globaldata globaldata;
|
||||
char __filler0[PAGE_SIZE - sizeof(struct globaldata)];
|
||||
|
||||
/* page 1..4 - CPAGE1,CPAGE2,CPAGE3,PPAGE1 */
|
||||
char CPAGE1[PAGE_SIZE];
|
||||
char CPAGE2[PAGE_SIZE];
|
||||
char CPAGE3[PAGE_SIZE];
|
||||
char PPAGE1[PAGE_SIZE];
|
||||
|
||||
/* page 5..4+UPAGES - idle stack (UPAGES pages) */
|
||||
/* page 1 - idle stack (UPAGES pages) */
|
||||
char idlestack[UPAGES * PAGE_SIZE];
|
||||
/* page 1+UPAGES... */
|
||||
};
|
||||
|
||||
extern struct privatespace SMP_prvspace[];
|
||||
|
@ -1988,14 +1988,9 @@ start_all_aps(u_int boot_addr)
|
||||
/* allocate and set up an idle stack data page */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES*PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[pg + 5 + i] = (pt_entry_t)
|
||||
SMPpt[pg + 1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
SMPpt[pg + 1] = 0; /* *prv_CMAP1 */
|
||||
SMPpt[pg + 2] = 0; /* *prv_CMAP2 */
|
||||
SMPpt[pg + 3] = 0; /* *prv_CMAP3 */
|
||||
SMPpt[pg + 4] = 0; /* *prv_PMAP1 */
|
||||
|
||||
/* prime data page for it to use */
|
||||
SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
|
||||
gd->gd_cpuid = x;
|
||||
@ -2053,7 +2048,7 @@ start_all_aps(u_int boot_addr)
|
||||
/* Allocate and setup BSP idle stack */
|
||||
stack = (char *)kmem_alloc(kernel_map, UPAGES * PAGE_SIZE);
|
||||
for (i = 0; i < UPAGES; i++)
|
||||
SMPpt[5 + i] = (pt_entry_t)
|
||||
SMPpt[1 + i] = (pt_entry_t)
|
||||
(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
|
||||
|
||||
*(int *)PTD = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user