diff options
| author | Ralph Wuerthner <rwuerthn@de.ibm.com> | 2007-10-12 16:11:28 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-10-12 16:13:04 +0200 |
| commit | 16db63fda0c63de7a7feb59c6ca59ce7e2670ffb (patch) | |
| tree | b72a180413715493ace94ce437070c02915dd798 /include/asm-s390 | |
| parent | 731475c92ed587ac0e112c49b47b12de8d0ab609 (diff) | |
| download | linux-3.10-16db63fda0c63de7a7feb59c6ca59ce7e2670ffb.tar.gz linux-3.10-16db63fda0c63de7a7feb59c6ca59ce7e2670ffb.tar.bz2 linux-3.10-16db63fda0c63de7a7feb59c6ca59ce7e2670ffb.zip | |
[S390] zcrypt: remove duplicated struct CPRBX definition
Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/zcrypt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/zcrypt.h b/include/asm-s390/zcrypt.h index b90e55888a5..a5dada61775 100644 --- a/include/asm-s390/zcrypt.h +++ b/include/asm-s390/zcrypt.h @@ -91,7 +91,7 @@ struct ica_rsa_modexpo_crt { * VUD block * key block */ -struct ica_CPRBX { +struct CPRBX { unsigned short cprb_len; /* CPRB length 220 */ unsigned char cprb_ver_id; /* CPRB version id. 0x02 */ unsigned char pad_000[3]; /* Alignment pad bytes */ @@ -130,7 +130,7 @@ struct ica_CPRBX { unsigned char cntrl_domain[4];/* Control domain */ unsigned char S390enf_mask[4];/* S/390 enforcement mask */ unsigned char pad_004[36]; /* reserved */ -}; +} __attribute__((packed)); /** * xcRB |