From 9e1ce8ed92e1a4e515042e554463d1dfb5660030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 5 Mar 2019 18:56:55 +0100 Subject: [PATCH] kernel: tweak USER_SIZE. Change-Id: Id0a4ad785bbd195e425dd32ca891dc4525bb3e18 Reviewed-on: https://review.haiku-os.org/c/1151 Reviewed-by: waddlesplash --- headers/private/kernel/arch/arm/arch_kernel.h | 2 +- headers/private/kernel/arch/m68k/arch_kernel.h | 2 +- headers/private/kernel/arch/mipsel/arch_kernel.h | 2 +- headers/private/kernel/arch/ppc/arch_kernel.h | 2 +- headers/private/kernel/arch/riscv64/arch_kernel.h | 2 +- headers/private/kernel/arch/sparc/arch_kernel.h | 2 +- headers/private/kernel/arch/x86/arch_kernel.h | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/headers/private/kernel/arch/arm/arch_kernel.h b/headers/private/kernel/arch/arm/arch_kernel.h index 766ab42b10..e4fa45b959 100644 --- a/headers/private/kernel/arch/arm/arch_kernel.h +++ b/headers/private/kernel/arch/arm/arch_kernel.h @@ -22,7 +22,7 @@ */ #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x80000000 - (0x10000 + 0x100000)) +#define USER_SIZE (0x80000000 - (0x10000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x60000000 diff --git a/headers/private/kernel/arch/m68k/arch_kernel.h b/headers/private/kernel/arch/m68k/arch_kernel.h index cef14fb2f0..1703e9734e 100644 --- a/headers/private/kernel/arch/m68k/arch_kernel.h +++ b/headers/private/kernel/arch/m68k/arch_kernel.h @@ -22,7 +22,7 @@ */ #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x80000000 - (0x10000 + 0x100000)) +#define USER_SIZE (0x80000000 - (0x10000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x60000000 diff --git a/headers/private/kernel/arch/mipsel/arch_kernel.h b/headers/private/kernel/arch/mipsel/arch_kernel.h index 237459177d..47da8ba256 100644 --- a/headers/private/kernel/arch/mipsel/arch_kernel.h +++ b/headers/private/kernel/arch/mipsel/arch_kernel.h @@ -25,7 +25,7 @@ */ #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x80000000 - (0x10000 + 0x100000)) +#define USER_SIZE (0x80000000 - (0x10000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x60000000 diff --git a/headers/private/kernel/arch/ppc/arch_kernel.h b/headers/private/kernel/arch/ppc/arch_kernel.h index 803a9aade7..66d842f4f9 100644 --- a/headers/private/kernel/arch/ppc/arch_kernel.h +++ b/headers/private/kernel/arch/ppc/arch_kernel.h @@ -22,7 +22,7 @@ */ #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x80000000 - (0x10000 + 0x100000)) +#define USER_SIZE (0x80000000 - (0x10000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x60000000 diff --git a/headers/private/kernel/arch/riscv64/arch_kernel.h b/headers/private/kernel/arch/riscv64/arch_kernel.h index fc0c1d0100..74dcf1c766 100644 --- a/headers/private/kernel/arch/riscv64/arch_kernel.h +++ b/headers/private/kernel/arch/riscv64/arch_kernel.h @@ -32,7 +32,7 @@ // uncanonical address region, it will be caught through a page fault. #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x800000000000 - (0x200000 + 0x100000)) +#define USER_SIZE (0x800000000000 - (0x200000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x7f0000000000 diff --git a/headers/private/kernel/arch/sparc/arch_kernel.h b/headers/private/kernel/arch/sparc/arch_kernel.h index bf2838bf1d..44fa61d97b 100644 --- a/headers/private/kernel/arch/sparc/arch_kernel.h +++ b/headers/private/kernel/arch/sparc/arch_kernel.h @@ -25,7 +25,7 @@ // uncanonical address region, it will be caught through a page fault. #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x800000000000 - (0x200000 + 0x100000)) +#define USER_SIZE (0x800000000000 - (0x200000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x7f0000000000 diff --git a/headers/private/kernel/arch/x86/arch_kernel.h b/headers/private/kernel/arch/x86/arch_kernel.h index 1ba4c1b54d..efd914f6d6 100644 --- a/headers/private/kernel/arch/x86/arch_kernel.h +++ b/headers/private/kernel/arch/x86/arch_kernel.h @@ -47,7 +47,7 @@ // uncanonical address region, it will be caught through a page fault. #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (0x800000000000 - (0x200000 + 0x100000)) +#define USER_SIZE (0x800000000000 - (0x200000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x7f0000000000 @@ -84,7 +84,7 @@ */ #define USER_BASE 0x100000 #define USER_BASE_ANY USER_BASE -#define USER_SIZE (KERNEL_BASE - (0x10000 + 0x100000)) +#define USER_SIZE (KERNEL_BASE - (0x10000 + USER_BASE)) #define USER_TOP (USER_BASE + (USER_SIZE - 1)) #define KERNEL_USER_DATA_BASE 0x60000000