From 7ca917e9bd681fe309805cd53f2759ea46f85736 Mon Sep 17 00:00:00 2001 From: Martin Doerr Date: Mon, 12 Feb 2018 15:29:35 +0100 Subject: [PATCH] 8197572: s390 build broken after 8165929 Reviewed-by: coleenp --- src/hotspot/cpu/s390/copy_s390.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/s390/copy_s390.hpp b/src/hotspot/cpu/s390/copy_s390.hpp index 3ee11c2edbe..c7eb27dc98a 100644 --- a/src/hotspot/cpu/s390/copy_s390.hpp +++ b/src/hotspot/cpu/s390/copy_s390.hpp @@ -740,13 +740,13 @@ static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t #endif } -static void pd_disjoint_words_atomic(HeapWord* from, HeapWord* to, size_t count) { +static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { // JVM2008: < 4k calls. assert(((((size_t)from) & 0x07L) | (((size_t)to) & 0x07L)) == 0, "No atomic copy w/o aligned data"); pd_aligned_disjoint_words(from, to, count); // Rare calls -> just delegate. } -static void pd_disjoint_words(HeapWord* from, HeapWord* to, size_t count) { +static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { // JVM2008: very rare. pd_aligned_disjoint_words(from, to, count); // Rare calls -> just delegate. }