diff -r 4c4b6a45be43 -r 1063026e8cee hotspot/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp --- a/hotspot/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp Thu Nov 21 12:30:35 2013 -0800 +++ b/hotspot/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp Thu Nov 21 18:29:34 2013 -0800 @@ -221,7 +221,7 @@ // Must do an explicit check if implicit checks are disabled. assert(!MacroAssembler::needs_explicit_null_check(in_bytes(Method::from_compiled_offset())), "sanity"); - if (!ImplicitNullChecks NOT_LINUX(|| true) /*!os::zero_page_read_protected()*/) { + if (!ImplicitNullChecks || !os::zero_page_read_protected()) { if (TrapBasedNullChecks) { __ trap_null_check(R19_method); } else {