Skip to content

Commit 95cdae7

Browse files
committed
COPYING,common/*s390x*: distribute under Apache 2 license for s390x
The Ceph project cannot distributed GPL code as it is incompatible with the LGPL that all Ceph code is licensed under. Since s390x is dual-licensed, we choose to use the Apache 2 license. Fixes: https://tracker.ceph.com/issues/68084 Signed-off-by: Patrick Donnelly <[email protected]>
1 parent 33e3f8d commit 95cdae7

File tree

5 files changed

+72
-14
lines changed

5 files changed

+72
-14
lines changed

COPYING

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,5 +227,4 @@ License: GNU Affero General Public License, Version 3
227227

228228
Files: src/common/*s390x*
229229
Copyright: 2024 IBM <[email protected]>
230-
License: GNU General Public License, version 2
231-
Apache License, version 2.0
230+
License: Apache License, version 2.0

src/common/crc32c_s390x.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
/*
2-
* CRC-32 algorithm implemented with the z/Architecture
3-
* Vector Extension Facility.
2+
* CRC-32 algorithm implemented with the z/Architecture Vector Extension
3+
* Facility.
4+
*
5+
* Copyright 2024 IBM Corporation
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
8+
* use this file except in compliance with the License. You may obtain a copy
9+
* of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16+
* License for the specific language governing permissions and limitations
17+
* under the License.
18+
*
419
*
5-
* Copyright IBM Corp. 2024
620
* Author(s): Hendrik Brueckner <[email protected]>
721
* Anton Blanchard <[email protected]>
822
* Bryan Chan <[email protected]>
923
* Chris Zou <[email protected]>
1024
* Aliaksei Makarau <[email protected]>
1125
*/
26+
1227
#include <sys/types.h>
1328
#include <endian.h>
1429
#include "crc32c_s390x.h"

src/common/crc32c_s390x.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* CRC-32 algorithm implemented with the z/Architecture Vector Extension
3+
* Facility.
4+
*
5+
* Copyright 2024 IBM Corporation
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
8+
* use this file except in compliance with the License. You may obtain a copy
9+
* of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16+
* License for the specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
#ifndef CEPH_COMMON_CRC32C_S390X_H
221
#define CEPH_COMMON_CRC32C_S390X_H
322

src/common/crc32c_s390x_le-vx.S

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
/*
22
* Hardware-accelerated CRC-32 variants for Linux on z Systems
33
*
4-
* Use the z/Architecture Vector Extension Facility to accelerate the
5-
* computing of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet
6-
* and Castagnoli.
4+
* Use the z/Architecture Vector Extension Facility to accelerate the computing
5+
* of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet and Castagnoli.
76
*
8-
* This CRC-32 implementation algorithm is bit-reflected and processes
9-
* the least-significant bit first (Little-Endian).
7+
* This CRC-32 implementation algorithm is bit-reflected and processes the
8+
* least-significant bit first (Little-Endian).
9+
*
10+
* Copyright 2015 IBM Corporation
11+
*
12+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
13+
* use this file except in compliance with the License. You may obtain a copy
14+
* of the License at
15+
*
16+
* http://www.apache.org/licenses/LICENSE-2.0
17+
*
18+
* Unless required by applicable law or agreed to in writing, software
19+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
20+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
21+
* License for the specific language governing permissions and limitations
22+
* under the License.
1023
*
11-
* Copyright IBM Corp. 2015
1224
* Author(s): Hendrik Brueckner <[email protected]>
1325
*/
1426

src/common/crc32c_s390x_vx-insn.h

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
/*
22
* Support for Vector Instructions
33
*
4-
* Assembler macros to generate .byte/.word code for particular
5-
* vector instructions that are supported by recent binutils.
4+
* Assembler macros to generate .byte/.word code for particular vector
5+
* instructions that are supported by recent binutils.
6+
*
7+
* Copyright 2015 IBM Corporation
8+
*
9+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
10+
* use this file except in compliance with the License. You may obtain a copy
11+
* of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
* License for the specific language governing permissions and limitations
19+
* under the License.
620
*
7-
* Copyright IBM Corp. 2015
821
* Author(s): Hendrik Brueckner <[email protected]>
922
*/
1023

0 commit comments

Comments
 (0)