diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
| commit | c32da02342b7521df25fefc2ef20aee0e61cf887 (patch) | |
| tree | 7e38f664fa3e13602c357d37f77d8adcf82fccc2 /arch/x86/crypto/twofish-i586-asm_32.S | |
| parent | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (diff) | |
| parent | 318ae2edc3b29216abd8a2510f3f80b764f06858 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
doc: fix typo in comment explaining rb_tree usage
Remove fs/ntfs/ChangeLog
doc: fix console doc typo
doc: cpuset: Update the cpuset flag file
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove drivers/parport/ChangeLog
Remove drivers/char/ChangeLog
doc: typo - Table 1-2 should refer to "status", not "statm"
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
devres/irq: Fix devm_irq_match comment
Remove reference to kthread_create_on_cpu
tree-wide: Assorted spelling fixes
tree-wide: fix 'lenght' typo in comments and code
drm/kms: fix spelling in error message
doc: capitalization and other minor fixes in pnp doc
devres: typo fix s/dev/devm/
Remove redundant trailing semicolons from macros
fix typo "definetly" -> "definitely" in comment
tree-wide: s/widht/width/g typo in comments
...
Fix trivial conflict in Documentation/laptops/00-INDEX
Diffstat (limited to 'arch/x86/crypto/twofish-i586-asm_32.S')
| -rw-r--r-- | arch/x86/crypto/twofish-i586-asm_32.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/crypto/twofish-i586-asm_32.S b/arch/x86/crypto/twofish-i586-asm_32.S index 39b98ed2c1b9..575331cb2a8a 100644 --- a/arch/x86/crypto/twofish-i586-asm_32.S +++ b/arch/x86/crypto/twofish-i586-asm_32.S | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/asm-offsets.h> | 23 | #include <asm/asm-offsets.h> |
| 24 | 24 | ||
| 25 | /* return adress at 0 */ | 25 | /* return address at 0 */ |
| 26 | 26 | ||
| 27 | #define in_blk 12 /* input byte array address parameter*/ | 27 | #define in_blk 12 /* input byte array address parameter*/ |
| 28 | #define out_blk 8 /* output byte array address parameter*/ | 28 | #define out_blk 8 /* output byte array address parameter*/ |
| @@ -230,8 +230,8 @@ twofish_enc_blk: | |||
| 230 | push %edi | 230 | push %edi |
| 231 | 231 | ||
| 232 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ | 232 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ |
| 233 | add $crypto_tfm_ctx_offset, %ebp /* ctx adress */ | 233 | add $crypto_tfm_ctx_offset, %ebp /* ctx address */ |
| 234 | mov in_blk+16(%esp),%edi /* input adress in edi */ | 234 | mov in_blk+16(%esp),%edi /* input address in edi */ |
| 235 | 235 | ||
| 236 | mov (%edi), %eax | 236 | mov (%edi), %eax |
| 237 | mov b_offset(%edi), %ebx | 237 | mov b_offset(%edi), %ebx |
| @@ -286,8 +286,8 @@ twofish_dec_blk: | |||
| 286 | 286 | ||
| 287 | 287 | ||
| 288 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ | 288 | mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */ |
| 289 | add $crypto_tfm_ctx_offset, %ebp /* ctx adress */ | 289 | add $crypto_tfm_ctx_offset, %ebp /* ctx address */ |
| 290 | mov in_blk+16(%esp),%edi /* input adress in edi */ | 290 | mov in_blk+16(%esp),%edi /* input address in edi */ |
| 291 | 291 | ||
| 292 | mov (%edi), %eax | 292 | mov (%edi), %eax |
| 293 | mov b_offset(%edi), %ebx | 293 | mov b_offset(%edi), %ebx |