Skip to content

Commit 0381f0e

Browse files
author
duke
committed
Backport d09b028407ff9d0e8c2dfd9cc5d0dca19c4497e3
1 parent dbfdc50 commit 0381f0e

File tree

34 files changed

+103
-103
lines changed

34 files changed

+103
-103
lines changed

src/hotspot/cpu/x86/vm_version_ext_x86.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ const char* const VM_Version_Ext::_feature_ecx_id[] = {
948948

949949
const char* const VM_Version_Ext::_feature_extended_ecx_id[] = {
950950
"LAHF/SAHF instruction support",
951-
"Core multi-processor leagacy mode",
951+
"Core multi-processor legacy mode",
952952
"",
953953
"",
954954
"",

src/hotspot/os/aix/os_aix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
789789
// JDK-8187028: It was observed that on some configurations (4K backed thread stacks)
790790
// the real thread stack size may be smaller than the requested stack size, by as much as 64K.
791791
// This very much looks like a pthread lib error. As a workaround, increase the stack size
792-
// by 64K for small thread stacks (arbitrarily choosen to be < 4MB)
792+
// by 64K for small thread stacks (arbitrarily chosen to be < 4MB)
793793
if (stack_size < 4096 * K) {
794794
stack_size += 64 * K;
795795
}

src/hotspot/os/bsd/semaphore_bsd.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
3030
#include <semaphore.h>
3131

3232
#ifdef __APPLE__
33-
// OS X doesn't support unamed POSIX semaphores, so the implementation in os_posix.cpp can't be used.
33+
// OS X doesn't support unnamed POSIX semaphores, so the implementation in os_posix.cpp can't be used.
3434

3535
static const char* sem_init_strerror(kern_return_t value) {
3636
switch (value) {

src/hotspot/os/bsd/semaphore_bsd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
3232
# include "semaphore_posix.hpp"
3333

3434
#else
35-
// OS X doesn't support unamed POSIX semaphores, so the implementation in os_posix.cpp can't be used.
35+
// OS X doesn't support unnamed POSIX semaphores, so the implementation in os_posix.cpp can't be used.
3636
# include "memory/allocation.hpp"
3737
# include <mach/semaphore.h>
3838

src/hotspot/os/posix/semaphore_posix.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
#include "precompiled.hpp"
2626
#ifndef __APPLE__
2727
#include "runtime/os.hpp"
28-
// POSIX unamed semaphores are not supported on OS X.
28+
// POSIX unnamed semaphores are not supported on OS X.
2929
#include "semaphore_posix.hpp"
3030
#include <semaphore.h>
3131

src/hotspot/share/classfile/modules.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
698698
ls.print("get_module(): module ");
699699
java_lang_String::print(module_name, tty);
700700
} else {
701-
ls.print("get_module(): Unamed Module");
701+
ls.print("get_module(): Unnamed Module");
702702
}
703703
if (klass != NULL) {
704704
ls.print_cr(" for class %s", klass->external_name());

src/hotspot/share/gc/parallel/psYoungGen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -317,7 +317,7 @@ bool PSYoungGen::resize_generation(size_t eden_size, size_t survivor_size) {
317317
if (orig_size == max_gen_size()) {
318318
log_trace(gc)("PSYoung generation size at maximum: " SIZE_FORMAT "K", orig_size/K);
319319
} else if (orig_size == min_gen_size()) {
320-
log_trace(gc)("PSYoung generation size at minium: " SIZE_FORMAT "K", orig_size/K);
320+
log_trace(gc)("PSYoung generation size at minimum: " SIZE_FORMAT "K", orig_size/K);
321321
}
322322
}
323323

src/hotspot/share/memory/metaspace/metaspaceCommon.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2018, 2020 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -66,7 +66,7 @@ static const char* display_unit_for_scale(size_t scale) {
6666
// Print a human readable size.
6767
// byte_size: size, in bytes, to be printed.
6868
// scale: one of 1 (byte-wise printing), sizeof(word) (word-size printing), K, M, G (scaled by KB, MB, GB respectively,
69-
// or 0, which means the best scale is choosen dynamically.
69+
// or 0, which means the best scale is chosen dynamically.
7070
// width: printing width.
7171
void print_human_readable_size(outputStream* st, size_t byte_size, size_t scale, int width) {
7272
if (scale == 0) {

src/hotspot/share/memory/metaspace/metaspaceCommon.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2018, 2020 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -67,7 +67,7 @@ void print_scaled_words_and_percentage(outputStream* st, size_t word_size, size_
6767
// Print a human readable size.
6868
// byte_size: size, in bytes, to be printed.
6969
// scale: one of 1 (byte-wise printing), sizeof(word) (word-size printing), K, M, G (scaled by KB, MB, GB respectively,
70-
// or 0, which means the best scale is choosen dynamically.
70+
// or 0, which means the best scale is chosen dynamically.
7171
// width: printing width.
7272
void print_human_readable_size(outputStream* st, size_t byte_size, size_t scale = 0, int width = -1);
7373

src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MetaspaceDCmd::MetaspaceDCmd(outputStream* output, bool heap) :
4444
_show_vslist("vslist", "Shows details about the underlying virtual space.", "BOOLEAN", false, "false"),
4545
_show_chunkfreelist("chunkfreelist", "Shows details about global chunk free lists (ChunkManager).", "BOOLEAN", false, "false"),
4646
_scale("scale", "Memory usage in which to scale. Valid values are: 1, KB, MB or GB (fixed scale) "
47-
"or \"dynamic\" for a dynamically choosen scale.",
47+
"or \"dynamic\" for a dynamically chosen scale.",
4848
"STRING", false, "dynamic"),
4949
_show_classes("show-classes", "If show-loaders is set, shows loaded classes for each loader.", "BOOLEAN", false, "false")
5050
{

0 commit comments

Comments
 (0)