mirror of
https://github.com/hermitcore/libhermit.git
synced 2025-03-09 00:00:03 +01:00
Merge branch 'devel' of github.com:RWTH-OS/HermitCore into devel
This commit is contained in:
commit
f1ba1aa30f
3 changed files with 6 additions and 4 deletions
|
@ -50,7 +50,7 @@ extern const void kernel_start;
|
|||
|
||||
#define IOAPIC_ADDR ((size_t) &kernel_start - 2*PAGE_SIZE)
|
||||
#define LAPIC_ADDR ((size_t) &kernel_start - 1*PAGE_SIZE)
|
||||
#define MAX_APIC_CORES 128
|
||||
#define MAX_APIC_CORES MAX_CORES
|
||||
|
||||
// IO APIC MMIO structure: write reg, then read or write data.
|
||||
typedef struct {
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define MAX_CORES 64
|
||||
#define MAX_CORES 128
|
||||
#define MAX_TASKS (MAX_CORES*2+2)
|
||||
#define MAX_ISLE 8
|
||||
#define MAX_FNAME 128
|
||||
|
@ -50,7 +50,6 @@ extern "C" {
|
|||
|
||||
#define BYTE_ORDER LITTLE_ENDIAN
|
||||
|
||||
#define LIBOS
|
||||
#define DYNAMIC_TICKS
|
||||
|
||||
#define BUILTIN_EXPECT(exp, b) __builtin_expect((exp), (b))
|
||||
|
|
|
@ -409,8 +409,10 @@ int clone_task(tid_t* id, entry_point_t ep, void* arg, uint8_t prio)
|
|||
kprintf("start new thread %d on core %d with stack address %p\n", i, core_id, stack);
|
||||
|
||||
out:
|
||||
if (ret)
|
||||
if (ret) {
|
||||
destroy_stack(stack, DEFAULT_STACK_SIZE);
|
||||
destroy_stack(ist, KERNEL_STACK_SIZE);
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (core_id != CORE_ID)
|
||||
|
@ -510,6 +512,7 @@ out:
|
|||
|
||||
if (ret) {
|
||||
destroy_stack(stack, DEFAULT_STACK_SIZE);
|
||||
destroy_stack(ist, KERNEL_STACK_SIZE);
|
||||
kfree(counter);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue