i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix missing SMP_MAX_CPUS on non-x86

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/alpha/stage2.h
+5 -3
View File
@@ -5,15 +5,17 @@
#ifndef _STAGE2_H #ifndef _STAGE2_H
#define _STAGE2_H #define _STAGE2_H
#include <boot.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_PHYS_MEM_ADDR_RANGE 4
#define MAX_VIRT_ALLOC_ADDR_RANGE 4 #define MAX_VIRT_ALLOC_ADDR_RANGE 4
#define MAX_PHYS_ALLOC_ADDR_RANGE 4 #define MAX_PHYS_ALLOC_ADDR_RANGE 4
typedef struct { typedef struct {
unsigned int start; unsigned int start;
unsigned int size; unsigned int size;
@@ -33,7 +35,7 @@ typedef struct {
unsigned int num_virt_alloc_ranges; unsigned int num_virt_alloc_ranges;
addr_range virt_alloc_range[MAX_VIRT_ALLOC_ADDR_RANGE]; addr_range virt_alloc_range[MAX_VIRT_ALLOC_ADDR_RANGE];
unsigned int num_cpus; unsigned int num_cpus;
addr_range cpu_kstack[MAX_BOOT_CPUS]; addr_range cpu_kstack[SMP_MAX_CPUS];
// architecture specific // architecture specific
} kernel_args; } kernel_args;
headers/private/kernel/boot/platform/amiga_m68k/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_AMIGA_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_AMIGA_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_AMIGA_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_AMIGA_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 1
#define MAX_BOOT_CPUS 1
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/atari_m68k/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_ATARI_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_ATARI_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_ATARI_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_ATARI_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 1
#define MAX_BOOT_CPUS 1
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/cfe/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_CFE_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_CFE_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_CFE_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_CFE_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 4
#define MAX_BOOT_CPUS 4
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/openfirmware/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_OPENFIRMWARE_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_OPENFIRMWARE_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_OPENFIRMWARE_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_OPENFIRMWARE_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 16
#define MAX_BOOT_CPUS 4
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/raspberrypi_arm/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_PI_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_PI_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_PI_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_PI_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 1
#define MAX_BOOT_CPUS 1
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/routerboard_mipsel/platform_kernel_args.h
+3 -2
View File
@@ -5,14 +5,15 @@
#ifndef _KERNEL_BOOT_PLATFORM_ROUTERBOARD_MIPSEL_KERNEL_ARGS_H #ifndef _KERNEL_BOOT_PLATFORM_ROUTERBOARD_MIPSEL_KERNEL_ARGS_H
#define _KERNEL_BOOT_PLATFORM_ROUTERBOARD_MIPSEL_KERNEL_ARGS_H #define _KERNEL_BOOT_PLATFORM_ROUTERBOARD_MIPSEL_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
#warning IMPLEMENT platform_kernel_args.h #warning IMPLEMENT platform_kernel_args.h
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 1
#define MAX_BOOT_CPUS 1
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/boot/platform/u-boot/platform_kernel_args.h
+3 -2
View File
@@ -5,12 +5,13 @@
#ifndef KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H
#define KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H #define KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H
#ifndef KERNEL_BOOT_KERNEL_ARGS_H #ifndef KERNEL_BOOT_KERNEL_ARGS_H
# error This file is included from <boot/kernel_args.h> only # error This file is included from <boot/kernel_args.h> only
#endif #endif
// must match SMP_MAX_CPUS in arch_smp.h #define SMP_MAX_CPUS 1
#define MAX_BOOT_CPUS 1
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 8 #define MAX_PHYSICAL_ALLOCATED_RANGE 8
#define MAX_VIRTUAL_ALLOCATED_RANGE 32 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
headers/private/kernel/cpu.h
-1
View File
@@ -88,7 +88,6 @@ typedef struct cpu_ent {
} cpu_ent CACHE_LINE_ALIGN; } cpu_ent CACHE_LINE_ALIGN;
//extern cpu_ent gCPU[MAX_BOOT_CPUS];
extern cpu_ent gCPU[]; extern cpu_ent gCPU[];
extern uint32 gCPUCacheLevelCount; extern uint32 gCPUCacheLevelCount;
src/tests/system/boot/loader/platform_kernel_args.h
+4 -2
View File
@@ -5,12 +5,14 @@
#ifndef PLATFORM_KERNEL_ARGS_H #ifndef PLATFORM_KERNEL_ARGS_H
#define PLATFORM_KERNEL_ARGS_H #define PLATFORM_KERNEL_ARGS_H
// must match SMP_MAX_CPUS in arch_smp.h
#define MAX_BOOT_CPUS 4 #define SMP_MAX_CPUS 4
#define MAX_PHYSICAL_MEMORY_RANGE 4 #define MAX_PHYSICAL_MEMORY_RANGE 4
#define MAX_PHYSICAL_ALLOCATED_RANGE 4 #define MAX_PHYSICAL_ALLOCATED_RANGE 4
#define MAX_VIRTUAL_ALLOCATED_RANGE 4 #define MAX_VIRTUAL_ALLOCATED_RANGE 4
struct platform_kernel_args { struct platform_kernel_args {
/* they are just empty! */ /* they are just empty! */
}; };