From 4b148d896a3eab261d7a67b6396e757a69c358a6 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 12 Oct 2016 08:58:50 +0200 Subject: [PATCH] nova: fix oom handling in kernel Fixes #2126 --- repos/base-nova/ports/nova.hash | 2 +- repos/base-nova/ports/nova.port | 2 +- repos/base-nova/src/kernel/target.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash index c44907ab02..aec6e3f64b 100644 --- a/repos/base-nova/ports/nova.hash +++ b/repos/base-nova/ports/nova.hash @@ -1 +1 @@ -6f6dc94fadf93e9fad741bbf6b2938f92e45f948 +dcaeb80c39a8f324129517bed071191b2243a8a7 diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port index 3fd842235e..2213e1509e 100644 --- a/repos/base-nova/ports/nova.port +++ b/repos/base-nova/ports/nova.port @@ -4,7 +4,7 @@ DOWNLOADS := nova.git # r9 branch - use r9_debug for more verbose kernel messages URL(nova) := https://github.com/alex-ab/NOVA.git -REV(nova) := bc5851221c412aa92d06c57b5b41944dd2ab08ae +REV(nova) := 6ad6dcece4ab9fb5c0caab0a0734c3082c5753c4 DIR(nova) := src/kernel/nova PATCHES := $(wildcard $(REP_DIR)/patches/*.patch) diff --git a/repos/base-nova/src/kernel/target.mk b/repos/base-nova/src/kernel/target.mk index 1ef1c1d953..5f94e18129 100644 --- a/repos/base-nova/src/kernel/target.mk +++ b/repos/base-nova/src/kernel/target.mk @@ -21,11 +21,11 @@ CC_OPT += -pipe \ -fno-stack-protector -fvisibility-inlines-hidden \ -fno-asynchronous-unwind-tables -std=gnu++0x ifeq ($(filter-out $(SPECS),32bit),) -CC_WARN += -Wframe-larger-than=64 +CC_WARN += -Wframe-larger-than=92 CC_OPT += -mpreferred-stack-boundary=2 -mregparm=3 else ifeq ($(filter-out $(SPECS),64bit),) -CC_WARN += -Wframe-larger-than=144 +CC_WARN += -Wframe-larger-than=240 CC_OPT += -mpreferred-stack-boundary=4 -mcmodel=kernel -mno-red-zone else $(error Unsupported environment)