# HG changeset patch # User sgehwolf # Date 1428078143 -3600 # Node ID 37d0575cf6decb57bc99201a2e0d658fd6b91925 # Parent 0b1e07df4b1b51e7d379350d34c306ab9df8bc75 8074312, PR2254: Enable hotspot builds on 4.x Linux kernels Summary: Add "4" to list of allowable versions Reviewed-by: dholmes, mikael diff -r 0b1e07df4b1b -r 37d0575cf6de make/linux/Makefile --- a/make/linux/Makefile Fri Jan 16 09:15:22 2015 +0100 +++ b/make/linux/Makefile Fri Apr 03 17:22:23 2015 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -235,7 +235,7 @@ # Solaris 2.5.1, 2.6). # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% +SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))