diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-24 10:24:30 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-24 11:17:05 -0500 |
| commit | a08b493398ae0e0b635dd426e5f7c0bb28cade6f (patch) | |
| tree | 813399c6bdef926d855cd14d4d7424051f926c26 /tpm-fix-stall-on-boot.patch | |
| parent | 71f70cd13e31389b0e4c7dceedc3c624571690c3 (diff) | |
| download | kernel-a08b493398ae0e0b635dd426e5f7c0bb28cade6f.tar.gz kernel-a08b493398ae0e0b635dd426e5f7c0bb28cade6f.tar.xz kernel-a08b493398ae0e0b635dd426e5f7c0bb28cade6f.zip | |
snapshot 2.6.38-rc2-git1
Diffstat (limited to 'tpm-fix-stall-on-boot.patch')
| -rw-r--r-- | tpm-fix-stall-on-boot.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/tpm-fix-stall-on-boot.patch b/tpm-fix-stall-on-boot.patch deleted file mode 100644 index adba40a6e..000000000 --- a/tpm-fix-stall-on-boot.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix TPM timeouts on boot (#530393) - ---- a/drivers/char/tpm/tpm.c -+++ a/drivers/char/tpm/tpm.c -@@ -354,12 +354,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, - tpm_protected_ordinal_duration[ordinal & - TPM_PROTECTED_ORDINAL_MASK]; - -- if (duration_idx != TPM_UNDEFINED) -+ if (duration_idx != TPM_UNDEFINED) { - duration = chip->vendor.duration[duration_idx]; -- if (duration <= 0) -+ /* if duration is 0, it's because chip->vendor.duration wasn't */ -+ /* filled yet, so we set the lowest timeout just to give enough */ -+ /* time to tpm_get_timeouts() succeed */ -+ return (duration <= 0 ? HZ : duration); -+ } else - return 2 * 60 * HZ; -- else -- return duration; - } - EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration); - - |