diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /lib/decompress_unxz.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'lib/decompress_unxz.c')
| -rw-r--r-- | lib/decompress_unxz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c index cecd23df2b9a..9f34eb56854d 100644 --- a/lib/decompress_unxz.c +++ b/lib/decompress_unxz.c | |||
| @@ -83,7 +83,7 @@ | |||
| 83 | * safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536 | 83 | * safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536 |
| 84 | * = 128 + (uncompressed_size >> 12) + 65536 | 84 | * = 128 + (uncompressed_size >> 12) + 65536 |
| 85 | * | 85 | * |
| 86 | * For comparision, according to arch/x86/boot/compressed/misc.c, the | 86 | * For comparison, according to arch/x86/boot/compressed/misc.c, the |
| 87 | * equivalent formula for Deflate is this: | 87 | * equivalent formula for Deflate is this: |
| 88 | * | 88 | * |
| 89 | * safety_margin = 18 + (uncompressed_size >> 12) + 32768 | 89 | * safety_margin = 18 + (uncompressed_size >> 12) + 32768 |