kernel: fix missing SMP_MAX_CPUS on non-x86

* Regression introduced due to scheduler change
* Drop MAX_BOOT_CPUS as it is no longer used
This commit is contained in:
Alexander von Gluck IV
2014-01-19 14:09:51 -06:00
parent 9d80738d95
commit 6647d2c95a
10 changed files with 30 additions and 20 deletions
+5 -3
View File
@@ -5,15 +5,17 @@
#ifndef _STAGE2_H
#define _STAGE2_H
#include <boot.h>
// must match SMP_MAX_CPUS in arch_smp.h
#define MAX_BOOT_CPUS 1
#define SMP_MAX_CPUS 1
#define MAX_PHYS_MEM_ADDR_RANGE 4
#define MAX_VIRT_ALLOC_ADDR_RANGE 4
#define MAX_PHYS_ALLOC_ADDR_RANGE 4
typedef struct {
unsigned int start;
unsigned int size;
@@ -33,7 +35,7 @@ typedef struct {
unsigned int num_virt_alloc_ranges;
addr_range virt_alloc_range[MAX_VIRT_ALLOC_ADDR_RANGE];
unsigned int num_cpus;
addr_range cpu_kstack[MAX_BOOT_CPUS];
addr_range cpu_kstack[SMP_MAX_CPUS];
// architecture specific
} kernel_args;