From b4a11d7792057ffd7d389b6ea6e4fd7a08261091 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 27 Dec 2015 12:47:37 +0000 Subject: [PATCH] kernel: hook in level2 include and udata changes --- Kernel/include/kernel.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Kernel/include/kernel.h b/Kernel/include/kernel.h index 3ad20039..54138ce3 100644 --- a/Kernel/include/kernel.h +++ b/Kernel/include/kernel.h @@ -36,6 +36,10 @@ From UZI by Doug Braun and UZI280 by Stefan Nitschke. #define ALIGNDOWN(v) (v) #endif +#ifdef CONFIG_LEVEL_2 +#include "level2.h" +#endif + #define CPM_EMULATOR_FILENAME "/usr/cpm/emulator" /* Maximum UFTSIZE can be is 16, then you need to alter the O_CLOEXEC code */ @@ -52,11 +56,15 @@ From UZI by Doug Braun and UZI280 by Stefan Nitschke. #ifndef PTABSIZE #define PTABSIZE 15 /* Process table size. */ #endif - #ifndef MAPBASE /* Usually the start of program and map match */ #define MAPBASE PROGBASE #endif +#ifndef NGROUP +#define NGROUP 16 +#endif + + #define MAXTICKS 10 /* Max ticks before switching out (time slice) default process time slice */ // #define MAXBACK 3 /* Process time slice for tasks not connected @@ -438,6 +446,11 @@ typedef struct u_data { inoptr u_root; /* Index into inode table of / */ inoptr u_rename; /* Used in n_open for rename() checking */ inoptr u_ctty; /* Controlling tty */ +#ifdef CONFIG_LEVEL_2 + uint16_t u_groups[NGROUP]; /* Group list */ + uint8_t u_ngroup; + struct rlimit u_rlimit[NRLIMIT]; /* Resource limits */ +#endif } u_data; -- 2.34.1