Modify x86 kernel command line to enable nmi watchog.

build_kernel_image.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Helper script that generates the signed kernel image
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 114 matching lines @@
 
 # Only let dm-verity block if rootfs verification is configured.
 dev_wait=0
 if [[ ${FLAGS_root} = "/dev/dm-0" ]]; then
   dev_wait=1
 fi
 
 cat <<EOF > "${FLAGS_working_dir}/boot.config"
 root=${FLAGS_root}
 quiet
-loglevel=1
+loglevel=7

[Mandeep Singh Baines, 2011/02/25 18:37:47]

Nit. This looks like leftover.

[vb, 2011/02/26 00:02:11]

Done.

 rootwait
 ro
 dm_verity.error_behavior=${FLAGS_verity_error_behavior}
 dm_verity.max_bios=${FLAGS_verity_max_ios}
 dm_verity.dev_wait=${dev_wait}
 ${verity_args}
 ${FLAGS_boot_args}
 EOF
 
 WORK="${WORK} ${FLAGS_working_dir}/boot.config"
@@ skipping 14 matching lines @@
 init=/sbin/init
 add_efi_memmap
 boot=local
 noresume
 noswap
 i915.modeset=1
 cros_secure
 kern_guid=%U
 tpm_tis.force=1
 tpm_tis.interrupts=0
+nmi_watchdog=1

[Mandeep Singh Baines, 2011/02/25 18:37:47]

We tried this and had issues. This should really be nmi_watchdog=2. Actually,
instead of 2 use the symbolic 'lapic,panic' as per:

http://git.chromium.org/gitweb/?p=kernel.git;a=blob;f=Documentation/kernel-pa...

Please test by running kernel_BootMessagesServer and  platform_HighResTimers.
Seting nmi_watchdog=1 breaks HighResTimers. It is also heavier weight than
nmi_watchdog=2.

[vb, 2011/02/26 00:02:11]

Done.

 EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"
 
   # We sign the image with the recovery_key, because this is what goes onto the
   # USB key. We can only boot from the USB drive in recovery mode.
   # For dev install shim, we need to use the installer keyblock instead of
   # the recovery keyblock because of the difference in flags.
   if [ ${FLAGS_use_dev_keys} -eq ${FLAGS_TRUE} ]; then
     USB_KEYBLOCK=installer_kernel.keyblock
     info "DEBUG: use dev install signing key"
@@ skipping 92 matching lines @@
   info "Cleaning up temporary files: ${WORK}"
   rm ${WORK}
   rmdir ${FLAGS_working_dir}
 fi
 
 info "Kernel partition image emitted: ${FLAGS_to}"
 
 if [[ -f ${FLAGS_rootfs_hash} ]]; then
   info "Root filesystem hash emitted: ${FLAGS_rootfs_hash}"
 fi