Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (61 commits)
  KEYS: Return more accurate error codes
  LSM: Add __init to fixup function.
  TOMOYO: Add pathname grouping support.
  ima: remove ACPI dependency
  TPM: ACPI/PNP dependency removal
  security/selinux/ss: Use kstrdup
  TOMOYO: Use stack memory for pending entry.
  Revert "ima: remove ACPI dependency"
  Revert "TPM: ACPI/PNP dependency removal"
  KEYS: Do preallocation for __key_link()
  TOMOYO: Use mutex_lock_interruptible.
  KEYS: Better handling of errors from construct_alloc_key()
  KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links
  TOMOYO: Use GFP_NOFS rather than GFP_KERNEL.
  ima: remove ACPI dependency
  TPM: ACPI/PNP dependency removal
  selinux: generalize disabling of execmem for plt-in-heap archs
  LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
  CRED: Holding a spinlock does not imply the holding of RCU read lock
  SMACK: Don't #include Ext2 headers
  ...

1 files changed, 10 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 567b7a8eb878..b9b0d7989f4e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -99,6 +99,7 @@ parameter is applicable:
         SWSUSP  Software suspend (hibernation) is enabled.
         SUSPEND System suspend states are enabled.
         FTRACE  Function tracing enabled.
+        TPM     TPM drivers are enabled.
         TS      Appropriate touchscreen support is enabled.
         UMS     USB Mass Storage support is enabled.
         USB     USB support is enabled.
@@ -2616,6 +2617,15 @@ and is between 256 and 4096 characters. It is defined in the file
 
         tp720=          [HW,PS2]
 
+        tpm_suspend_pcr=[HW,TPM]
+                        Format: integer pcr id
+                        Specify that at suspend time, the tpm driver
+                        should extend the specified pcr with zeros,
+                        as a workaround for some chips which fail to
+                        flush the last written pcr on TPM_SaveState.
+                        This will guarantee that all the other pcrs
+                        are saved.
+
         trace_buf_size=nn[KMG]
                         [FTRACE] will set tracing buffer size.