Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0850e921
Commit
0850e921
authored
7 years ago
by
Christian Borntraeger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 's390forkvm' of
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
parents
730cd632
152c1c8d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
arch/s390/include/asm/cpacf.h
arch/s390/include/asm/cpacf.h
+3
-2
No files found.
arch/s390/include/asm/cpacf.h
View file @
0850e921
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
#define CPACF_PCC 0xb92c
/* MSA4 */
#define CPACF_PCC 0xb92c
/* MSA4 */
#define CPACF_KMCTR 0xb92d
/* MSA4 */
#define CPACF_KMCTR 0xb92d
/* MSA4 */
#define CPACF_PPNO 0xb93c
/* MSA5 */
#define CPACF_PPNO 0xb93c
/* MSA5 */
#define CPACF_KMA 0xb929
/* MSA8 */
/*
/*
* En/decryption modifier bits
* En/decryption modifier bits
...
@@ -149,8 +150,8 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
...
@@ -149,8 +150,8 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
asm
volatile
(
asm
volatile
(
" spm 0
\n
"
/* pckmo doesn't change the cc */
" spm 0
\n
"
/* pckmo doesn't change the cc */
/* Parameter reg
isters are ignored, but may not be 0
*/
/* Parameter reg
s are ignored, but must be nonzero and unique
*/
"0: .insn rrf,%[opc] << 16,2,
2,2
,0
\n
"
"0: .insn rrf,%[opc] << 16,2,
4,6
,0
\n
"
" brc 1,0b
\n
"
/* handle partial completion */
" brc 1,0b
\n
"
/* handle partial completion */
:
"=m"
(
*
mask
)
:
"=m"
(
*
mask
)
:
[
fc
]
"d"
(
r0
),
[
pba
]
"a"
(
r1
),
[
opc
]
"i"
(
opcode
)
:
[
fc
]
"d"
(
r0
),
[
pba
]
"a"
(
r1
),
[
opc
]
"i"
(
opcode
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment