# HG changeset patch
# User zgu
# Date 1313500727 14400
# Node ID a68e11dceb832d3b3e1ffce33680df9bfb3fd90c
# Parent  279ef19167738d52c2378139b52eebe172ea28a5# Parent  46cb9a7b8b017ff3c00795cd5f776e92860740f1
Merge

diff -r 279ef1916773 -r a68e11dceb83 make/linux/Makefile
--- a/make/linux/Makefile	Tue Jul 12 21:13:53 2011 -0400
+++ b/make/linux/Makefile	Tue Aug 16 09:18:47 2011 -0400
@@ -230,7 +230,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% 2.7%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
 OS_VERSION := $(shell uname -r)
 EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
 
diff -r 279ef1916773 -r a68e11dceb83 src/share/vm/runtime/os.cpp
--- a/src/share/vm/runtime/os.cpp	Tue Jul 12 21:13:53 2011 -0400
+++ b/src/share/vm/runtime/os.cpp	Tue Aug 16 09:18:47 2011 -0400
@@ -1299,7 +1299,7 @@
   size_t sz, i = 0;
 
   // read until EOF, EOL or buf is full
-  while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-1) && buf[i] != '\n') {
+  while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
      ++i;
   }
 
@@ -1320,7 +1320,7 @@
   }
 
   // line is longer than size of buf, skip to EOL
-  int ch;
+  char ch;
   while (read(fd, &ch, 1) == 1 && ch != '\n') {
     // Do nothing
   }